diff --git a/Content.Client/Audio/Jukebox/JukeboxMenu.xaml b/Content.Client/Audio/Jukebox/JukeboxMenu.xaml
index e8d39a9b119..26c636e5de9 100644
--- a/Content.Client/Audio/Jukebox/JukeboxMenu.xaml
+++ b/Content.Client/Audio/Jukebox/JukeboxMenu.xaml
@@ -1,8 +1,10 @@
 <ui:FancyWindow xmlns="https://spacestation14.io" xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
                 SetSize="400 500" Title="{Loc 'jukebox-menu-title'}">
     <BoxContainer Margin="4 0" Orientation="Vertical">
-        <ItemList Name="MusicList" SelectMode="Button" Margin="3 3 3 3"
-        HorizontalExpand="True" VerticalExpand="True" SizeFlagsStretchRatio="8"/>
+        <ScrollContainer MinHeight="350">
+            <ItemList Name="MusicList" SelectMode="Button" Margin="3 3 3 3"
+            HorizontalExpand="True" VerticalExpand="True" SizeFlagsStretchRatio="8"/>
+        </ScrollContainer>
         <BoxContainer Orientation="Vertical">
             <Label Name="SongSelected" Text="{Loc 'jukebox-menu-selectedsong'}" />
             <Label Name="SongName" Text="---" />
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml b/Content.Client/Cargo/UI/BountyEntry.xaml
index 158ea97b1cf..1a6debebc6a 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml
@@ -8,14 +8,16 @@
                       HorizontalExpand="True">
             <BoxContainer Orientation="Horizontal">
                 <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-                    <RichTextLabel Name="RewardLabel"/>
-                    <RichTextLabel Name="ManifestLabel"/>
+                    <RichTextLabel Name="RewardLabel" Access="Public" />
+                    <RichTextLabel Name="ManifestLabel" Access="Public"/>
+                    <RichTextLabel Name="CriminalLabel" Access="Public" />
                 </BoxContainer>
                 <Control MinWidth="10"/>
                 <BoxContainer Orientation="Vertical" MinWidth="120">
                     <BoxContainer Orientation="Horizontal" MinWidth="120">
                         <Button Name="PrintButton"
                                 Text="{Loc 'bounty-console-label-button-text'}"
+                                Access="Public"
                                 HorizontalExpand="False"
                                 HorizontalAlignment="Right"/>
                     </BoxContainer>
@@ -40,6 +42,7 @@
                     </ProgressBar>
                 </BoxContainer>
             </BoxContainer>
+            
         </BoxContainer>
     </PanelContainer>
 </BoxContainer>
diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
index f65af1ea0ea..4250f0204ea 100644
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
@@ -10,7 +10,6 @@ namespace Content.Client.Cargo.UI
     public sealed partial class CargoProductRow : BoxContainer
     {
         public CargoProductPrototype? Product { get; set; }
-
         public CargoProductRow()
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/CrewAssignments/AdminUI/CodexEui.cs b/Content.Client/CrewAssignments/AdminUI/CodexEui.cs
index f244537ee84..7a8609fa772 100644
--- a/Content.Client/CrewAssignments/AdminUI/CodexEui.cs
+++ b/Content.Client/CrewAssignments/AdminUI/CodexEui.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Fax;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Map;
 
 namespace Content.Client.CrewAssignments.AdminUI;
 
@@ -13,6 +14,7 @@ public sealed class CodexEui : BaseEui
 {
     private readonly CodexWindow _window;
     private readonly CodexEditMenu _edit;
+    private string _sectorStatus = "";
 
     public CodexEui()
     {
@@ -20,6 +22,13 @@ public CodexEui()
         _edit = new CodexEditMenu(this);
         _window.OnClose += () => SendMessage(new CodexEuiMsg.Close());
         _window.CreateButton.OnPressed += _ => OnCreate();
+        _window.SectorButton.OnPressed += _ => OnSectorButton();
+    }
+
+    private void OnSectorButton()
+    {
+        _edit.UpdateState(-1, "Sector Status", _sectorStatus, new List<String>(), true);
+        _edit.OpenCentered();
     }
 
     public override void Opened()
@@ -49,6 +58,7 @@ public override void HandleState(EuiStateBase state)
                 _edit.UpdateState(entry.ID, entry.Title, entry.Description, entry.Whitelist, entry.Visible);
             }
         }
+        _sectorStatus = cast.SectorStatus;
 
     }
 
diff --git a/Content.Client/CrewAssignments/AdminUI/CodexWindow.xaml b/Content.Client/CrewAssignments/AdminUI/CodexWindow.xaml
index d99a2d2ac9f..f4cccaadeb7 100644
--- a/Content.Client/CrewAssignments/AdminUI/CodexWindow.xaml
+++ b/Content.Client/CrewAssignments/AdminUI/CodexWindow.xaml
@@ -6,6 +6,7 @@
         <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
             <BoxContainer Orientation="Vertical" Access="Public">
                 <Button Name="CreateButton" Text="Create New Entry" Access="Public"></Button>
+                <Button Name="SectorButton" Text="Edit Sector Status" Access="Public"></Button>
                 <BoxContainer Orientation="Vertical" Access="Public" Name="CodexContainer">
 
                 </BoxContainer>
diff --git a/Content.Client/CrewAssignments/Systems/JobNetSystem.cs b/Content.Client/CrewAssignments/Systems/JobNetSystem.cs
index 506beb9bd68..dd082236953 100644
--- a/Content.Client/CrewAssignments/Systems/JobNetSystem.cs
+++ b/Content.Client/CrewAssignments/Systems/JobNetSystem.cs
@@ -1,7 +1,9 @@
 using Content.Shared.CrewAssignments.Components;
 using Content.Shared.CrewAssignments.Systems;
+using Content.Shared.DoAfter;
 using Content.Shared.Precursor;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -10,5 +12,4 @@ namespace Content.Client.CrewAssignments.Systems;
 
 public sealed class JobNetSystem : SharedJobNetSystem
 {
-
 }
diff --git a/Content.Client/CrewAssignments/UI/JobNetBoundUserInterface.cs b/Content.Client/CrewAssignments/UI/JobNetBoundUserInterface.cs
index d44f8cc3b92..08d187a102b 100644
--- a/Content.Client/CrewAssignments/UI/JobNetBoundUserInterface.cs
+++ b/Content.Client/CrewAssignments/UI/JobNetBoundUserInterface.cs
@@ -1,8 +1,11 @@
 using Content.Client.CrewAssignments.UI;
+using Content.Client.UserInterface.Systems.Guidebook;
+using Content.Shared.Cargo.Components;
 using Content.Shared.CrewAssignments;
 using Content.Shared.CrewAssignments.Components;
 using Content.Shared.Store;
 using JetBrains.Annotations;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BaseButton;
@@ -28,16 +31,46 @@ public JobNetBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey
     protected override void Open()
     {
         base.Open();
-
+        var spriteSystem = EntMan.System<SpriteSystem>();
         _menu = this.CreateWindow<JobNetMenu>();
         _menu.Owner = this;
+        _menu._spriteSystem = spriteSystem;
         _menu.PossibleJobs.OnItemSelected += OnJobPressed;
         _menu.LevelPurchaseButton.OnPressed += OnLevelPurchase;
         _menu.DealerSelect.OnPressed += DealerSelect_OnPressed;
         _menu.AssassinSelect.OnPressed += AssassinSelect_OnPressed;
         _menu.BountyHSelect.OnPressed += BountyHSelect_OnPressed;
+        _menu.HuntedLEB.OnPressed += HuntedLEB_OnPressed;
+        _menu.HuntLEB.OnPressed += HuntLEB_OnPressed;
+        _menu.OnItemSelected += (row) =>
+        {
+            if (row == null || row.Product == null)
+                return;
+
+            SendMessage(new JobNetPurchasePrecursorMessage(row.Product.ID));
+        };
+        _menu.OnLabelButtonPressed += id =>
+        {
+            SendMessage(new JobNetDealerLabelMessage(id));
+        };
         CodexMenu = new();
+        _menu.PrecursorGuidebook.OnPressed += (ButtonEventArgs obj) =>
+        {
+            var guidebookController = _menu.UserInterfaceManager.GetUIController<GuidebookUIController>();
+            guidebookController.OpenGuidebook(selected: "Precursor");
+        };
+    }
+
+    private void HuntLEB_OnPressed(ButtonEventArgs obj)
+    {
+        if (_menu == null) return;
+        SendMessage(new JobNetSubmitHuntMessage(_menu.HuntLE.Text));
+    }
 
+    private void HuntedLEB_OnPressed(ButtonEventArgs obj)
+    {
+        if (_menu == null) return;
+        SendMessage(new JobNetSubmitHuntedMessage(_menu.HuntedLE.Text));
     }
 
     private void BountyHSelect_OnPressed(ButtonEventArgs obj)
diff --git a/Content.Client/CrewAssignments/UI/JobNetMenu.xaml b/Content.Client/CrewAssignments/UI/JobNetMenu.xaml
index fa9949e8cd0..8641b55df76 100644
--- a/Content.Client/CrewAssignments/UI/JobNetMenu.xaml
+++ b/Content.Client/CrewAssignments/UI/JobNetMenu.xaml
@@ -82,23 +82,25 @@
                         <Label Text="ZENITH SECTOR" Margin="0 0 10 0"
                            StyleClasses="LabelKeyText" />
                     </BoxContainer>
+                    <Control MinHeight="40" />
                     <BoxContainer Orientation="Horizontal">
                         <Label Text="Sector Development:" Margin="0 0 10 0"
                            StyleClasses="LabelKeyText" />
                         <Label Name="SectorDevelopmentLabel" Text="10" Margin="0 0 10 0" />
                     </BoxContainer>
+                    <Control MinHeight="20" />
                     <BoxContainer Orientation="Horizontal">
                         <Label Text="Sector Chaos:" Margin="0 0 10 0"
                            StyleClasses="LabelKeyText" />
                         <Label Name="SectorChaosLabel" Text="100/1500" Margin="0 0 10 0" />
                     </BoxContainer>
+                    <Control MinHeight="20" />
                     <BoxContainer Orientation="Horizontal">
                         <Label Text="Sector Status:" Margin="0 0 10 0"
                            StyleClasses="LabelKeyText" />
                     </BoxContainer>
-                    <PanelContainer StyleClasses="BackgroundPanel" HorizontalExpand="True" MinHeight="30" Margin="10 10 10 0">
-                        <BoxContainer Orientation="Vertical">
-                        </BoxContainer>
+                    <PanelContainer StyleClasses="BackgroundPanel" HorizontalExpand="True" MinHeight="120" Margin="10 10 10 0">
+                        <RichTextLabel Name="SectorStatusLabel" />
                     </PanelContainer>
                 </BoxContainer>
 
@@ -172,6 +174,8 @@
                                StyleClasses="LabelKeyText" />
                         <Label Text="Civillian"
                                Name="PLevelText" />
+                        <Control HorizontalExpand="True" />
+                        <Button Name="PrecursorGuidebook" Text="Guide" Access="Public" />
                     </BoxContainer>
                     <BoxContainer Orientation="Horizontal">
                         <ProgressBar Name="PLevelBar"
@@ -223,7 +227,7 @@
                                                         PlaceHolder="Secret Passphrase"
                                                         Access="Public"
                                                         HorizontalExpand="True" />
-                                                        <Button Name="HuntedLEB" Text="Submit" />
+                                                        <Button Access="Public" Name="HuntedLEB" Text="Submit" />
                                                     </BoxContainer>
                                             
                                                     <Label Access="Public" Text="Reward: 500 Precursor" />
@@ -233,19 +237,21 @@
                                                 <BoxContainer
                                                 HorizontalExpand="True"
                                                 Orientation="Vertical">
-                                                    <Label Access="Public" Text="Hunt Faurns Goldberg and enter their Secret Passphrase." />
+                                                    <Label Name="HuntDescLabel" Access="Public" Text="Hunt Faurns Goldberg and enter their Secret Passphrase." />
                                                     <BoxContainer Orientation="Horizontal">
                                                         <LineEdit Name="HuntLE"
                                                         PlaceHolder="Secret Passphrase"
                                                         Access="Public"
                                                         HorizontalExpand="True" />
-                                                        <Button Name="HuntLEB" Text="Submit" />
+                                                        <Button Access="Public" Name="HuntLEB" Text="Submit" />
                                                     </BoxContainer>
                                                     <Label Access="Public" Text="Reward: 500 Precursor" />
                                                     <Label Access="Public" Text="Sector chaos will increase" />
                                                 </BoxContainer>
                                             </PanelContainer>
-                                
+                                            <BoxContainer Name="DealerObjectives" Orientation="Vertical">
+                                                
+                                            </BoxContainer>
                                         </BoxContainer>
                                     </BoxContainer>
                                 </BoxContainer>
@@ -299,7 +305,26 @@
                                     StyleClasses="LabelKeyText" />
                             </BoxContainer>
                             <BoxContainer Orientation="Vertical" Name="PurchasesContent">
-                                
+                                <Label Text="Rank 2:"
+                                    StyleClasses="LabelKeyText" />
+                                <BoxContainer Orientation="Vertical" Name="Rank2Content">
+                                    
+                                </BoxContainer>
+                                <Label Text="Rank 3:"
+                                    StyleClasses="LabelKeyText" />
+                                <BoxContainer Orientation="Vertical" Name="Rank3Content">
+
+                                </BoxContainer>
+                                <Label Text="Rank 4:"
+                                    StyleClasses="LabelKeyText" />
+                                <BoxContainer Orientation="Vertical" Name="Rank4Content">
+
+                                </BoxContainer>
+                                <Label Text="Rank 5:"
+                                    StyleClasses="LabelKeyText" />
+                                <BoxContainer Orientation="Vertical" Name="Rank5Content">
+
+                                </BoxContainer>
                             </BoxContainer>
                         </BoxContainer>
                     
diff --git a/Content.Client/CrewAssignments/UI/JobNetMenu.xaml.cs b/Content.Client/CrewAssignments/UI/JobNetMenu.xaml.cs
index 1a2fef9e20f..31a45f7a341 100644
--- a/Content.Client/CrewAssignments/UI/JobNetMenu.xaml.cs
+++ b/Content.Client/CrewAssignments/UI/JobNetMenu.xaml.cs
@@ -2,6 +2,7 @@
 using Content.Client.Cargo.UI;
 using Content.Client.Message;
 using Content.Client.Store.Ui;
+using Content.Shared.Cargo.Prototypes;
 using Content.Shared.CrewAssignments;
 using Content.Shared.CrewAssignments.Components;
 using Content.Shared.CrewAssignments.Prototypes;
@@ -17,6 +18,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using System.Linq;
+using System.Runtime.Intrinsics.X86;
 using System.Security.AccessControl;
 using System.Text;
 using static Robust.Client.UserInterface.Controls.BaseButton;
@@ -31,9 +33,11 @@ public sealed partial class JobNetMenu : DefaultWindow
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     public TimeSpan UntilNextPay = TimeSpan.Zero;
     public TimeSpan UntilNextPrec = TimeSpan.Zero;
-
+    public TimeSpan UntilNextRogue = TimeSpan.Zero;
+    public SpriteSystem? _spriteSystem;
     public JobNetBoundUserInterface? Owner;
-
+    public event Action<CargoProductRow?>? OnItemSelected;
+    public Action<string>? OnLabelButtonPressed;
     public JobNetMenu()
     {
         RobustXamlLoader.Load(this);
@@ -164,8 +168,8 @@ public void UpdateState(JobNetUpdateState state)
             NextBenefitsLabel.SetMarkup(nextLevelDesc);
         }
 
-        PrecursorBalanceLabel.Text = state.Precursor.ToString();
-
+        PrecursorBalanceLabel.Text = $"P {state.Precursor}";
+        var itemLevel = 0;
         foreach (var objective in state.Objectives)
         {
             _prototypeManager.Resolve(objective, out var proto);
@@ -178,11 +182,13 @@ public void UpdateState(JobNetUpdateState state)
 
         }
         UntilNextPrec = state.PrecursorResetTime;
+        UntilNextRogue = state.RogueObjectiveResetTime;
         ObjectiveTimerLabel.Text = UntilNextPrec.ToString("mm\\:ss");
 
         _prototypeManager.Resolve(state.RogueLevel, out var rogueLevel);
         if (rogueLevel != null)
         {
+            itemLevel = rogueLevel.ItemLevel;
             PLevelText.Text = rogueLevel.Name;
             _prototypeManager.Resolve(rogueLevel.Next, out var nextLevel);
             if (nextLevel != null)
@@ -246,6 +252,149 @@ public void UpdateState(JobNetUpdateState state)
                     break;
 
             }
+            SecretPhraseLabel.Text = state.SecretPhrase;
+            List<CargoProductPrototype> level1 = new();
+            List<CargoProductPrototype> level2 = new();
+            List<CargoProductPrototype> level3 = new();
+            List<CargoProductPrototype> level4 = new();
+            if(_spriteSystem != null)
+            {
+                
+                foreach (var prod in _prototypeManager.EnumeratePrototypes<CargoProductPrototype>())
+                {
+                    if (prod.Group == "syndicatemarket")
+                    {
+                        level1.Add(prod);
+                    }
+                    else if (prod.Group == "syndicatemarket2")
+                    {
+                        level2.Add(prod);
+                    }
+                    else if (prod.Group == "syndicatemarket3")
+                    {
+                        level3.Add(prod);
+                    }
+                    else if (prod.Group == "syndicatemarket4")
+                    {
+                        level4.Add(prod);
+                    }
+                }
+                Rank2Content.RemoveAllChildren();
+                Rank3Content.RemoveAllChildren();
+                Rank4Content.RemoveAllChildren();
+                Rank5Content.RemoveAllChildren();
+                foreach (var prototype in level1)
+                {
+                    var button = new CargoProductRow
+                    {
+                        Product = prototype,
+                        ProductName = { Text = prototype.Name },
+                        MainButton = { ToolTip = prototype.Description },
+                        PointCost = { Text = $"P {prototype.Cost}" },
+                        Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
+                    };
+                    if(itemLevel < 1)
+                    {
+                        button.MainButton.Disabled = true;
+                        button.MainButton.ToolTip = "Requires Rogue Level 2";
+                    }
+                    button.MainButton.OnPressed += args =>
+                    {
+                        OnItemSelected?.Invoke(button);
+                    };
+                    Rank2Content.AddChild(button);
+                }
+                foreach (var prototype in level2)
+                {
+                    var button = new CargoProductRow
+                    {
+                        Product = prototype,
+                        ProductName = { Text = prototype.Name },
+                        MainButton = { ToolTip = prototype.Description },
+                        PointCost = { Text = $"P {prototype.Cost}" },
+                        Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
+                    };
+                    if (itemLevel < 2)
+                    {
+                        button.MainButton.Disabled = true;
+                        button.MainButton.ToolTip = "Requires Rogue Level 3";
+                    }
+                    button.MainButton.OnPressed += args =>
+                    {
+                        OnItemSelected?.Invoke(button);
+                    };
+                    Rank3Content.AddChild(button);
+                }
+                foreach (var prototype in level3)
+                {
+                    var button = new CargoProductRow
+                    {
+                        Product = prototype,
+                        ProductName = { Text = prototype.Name },
+                        MainButton = { ToolTip = prototype.Description },
+                        PointCost = { Text = $"P {prototype.Cost}" },
+                        Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
+                    };
+                    if (itemLevel < 3)
+                    {
+                        button.MainButton.Disabled = true;
+                        button.MainButton.ToolTip = "Requires Rogue Level 4";
+                    }
+                    button.MainButton.OnPressed += args =>
+                    {
+                        OnItemSelected?.Invoke(button);
+                    };
+                    Rank4Content.AddChild(button);
+                }
+                foreach (var prototype in level4)
+                {
+                    var button = new CargoProductRow
+                    {
+                        Product = prototype,
+                        ProductName = { Text = prototype.Name },
+                        MainButton = { ToolTip = prototype.Description },
+                        PointCost = { Text = $"P {prototype.Cost}" },
+                        Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
+                    };
+                    if (itemLevel < 4)
+                    {
+                        button.MainButton.Disabled = true;
+                        button.MainButton.ToolTip = "Requires Rogue Level 5";
+                    }
+                    button.MainButton.OnPressed += args =>
+                    {
+                        OnItemSelected?.Invoke(button);
+                    };
+                    Rank5Content.AddChild(button);
+                }
+                if(state.KillTarget == null)
+                {
+                    HuntPanel.Visible = false;
+                }
+                else
+                {
+                    HuntDescLabel.Text = $"Hunt {state.KillTarget} and enter their Secret Passphrase.";
+                }
+
+            }
+            if(state.DealerObjective == null)
+            {
+                DealerObjectives.RemoveAllChildren();
+            }
+            else
+            {
+                DealerObjectives.RemoveAllChildren();
+                var entry = new BountyEntry(state.DealerObjective, TimeSpan.Zero);
+                entry.RewardLabel.Text = entry.RewardLabel.Text + " (Complete this Bounty for P 500)";
+                if (state.DealerObjectiveStation != null)
+                    entry.CriminalLabel.Text = $"Deliver To: {state.DealerObjectiveStation}";
+                entry.PrintButton.Text = "Teleport Label";
+                entry.OnLabelButtonPressed += () => OnLabelButtonPressed?.Invoke(state.DealerObjective.Id);
+                DealerObjectives.AddChild(entry);
+            }
+            SectorChaosLabel.Text = $"{state.SectorChaos}";
+            SectorDevelopmentLabel.Text = $"{state.SectorDevelopment}";
+            SectorStatusLabel.SetMarkup(state.SectorStatus);
         }
 
     }
@@ -269,6 +418,11 @@ private void UpdateSkipButton(float deltaSeconds)
             UntilNextPrec -= TimeSpan.FromSeconds(deltaSeconds);
             ObjectiveTimerLabel.Text = UntilNextPrec.ToString("mm\\:ss");
         }
+        if (UntilNextRogue.TotalSeconds > 0)
+        {
+            UntilNextRogue -= TimeSpan.FromSeconds(deltaSeconds);
+            NetworkObjectiveTimerLabel.Text = UntilNextRogue.ToString("mm\\:ss");
+        }
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
index 8e78d8d0588..726f66efef5 100644
--- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
+++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -174,7 +174,6 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
         if (!TryComp<CryostorageComponent>(cryostorageEnt, out var cryostorageComponent))
             return;
 
-        // if we have a session, we use that to add back in all the job slots the player had.
         if (userId != null)
         {
             var saveFilePath = new ResPath($"{userId}]{name}");
@@ -193,6 +192,14 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
             _transform.DetachEntity(ent, Transform(ent));
             QueueDel(ent.Owner);
         }
+        if (cryostorageComponent.PersonalMode)
+        {
+            cryostorageComponent.PersonalName = name;
+            cryostorageComponent.PersonalOccupied = true;
+            var ev = new PersonalCryoEvent(true);
+            RaiseLocalEvent(cryostorageEnt.Value, ref ev);
+        }
+            
 
         _audio.PlayPvs(cryostorageComponent.RemoveSound, ent);
 
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index a13120b6713..123833960bd 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -646,8 +646,8 @@ public void Update(EntityUid uid, PlantHolderComponent? component = null)
 
         CheckHealth(uid, component);
 
-        if (component.Harvest && component.Seed.HarvestRepeat == HarvestType.SelfHarvest)
-            AutoHarvest(uid, component);
+        //if (component.Harvest && component.Seed.HarvestRepeat == HarvestType.SelfHarvest)
+        //    AutoHarvest(uid, component);
 
         // If enough time has passed since the plant was harvested, we're ready to harvest again!
         if (!component.Dead && component.Seed.ProductPrototypes.Count > 0)
diff --git a/Content.Server/Cargo/Components/CargoBountyLabelComponent.cs b/Content.Server/Cargo/Components/CargoBountyLabelComponent.cs
index ae63ddc7957..b1263ae5f61 100644
--- a/Content.Server/Cargo/Components/CargoBountyLabelComponent.cs
+++ b/Content.Server/Cargo/Components/CargoBountyLabelComponent.cs
@@ -23,4 +23,7 @@ public sealed partial class CargoBountyLabelComponent : Component
     /// </summary>
     [DataField]
     public EntityUid? AssociatedStationId;
+
+    [DataField]
+    public string? DealerName;
 }
diff --git a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
index 1f9fb0afd24..1dda44e7517 100644
--- a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
@@ -27,7 +27,6 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
     /// A list of all the bounties that have been completed or
     /// skipped for a station.
     /// </summary>
-    [DataField]
     public List<CargoBountyHistoryData> History = new();
 
     /// <summary>
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index e6d91342ea0..90d63a7edf0 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -1,4 +1,5 @@
 using Content.Server.Cargo.Components;
+using Content.Server.CrewAssignments.Systems;
 using Content.Server.NameIdentifier;
 using Content.Shared.Access.Components;
 using Content.Shared.Atmos.Components;
@@ -7,7 +8,9 @@
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
+using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Labels.EntitySystems;
 using Content.Shared.NameIdentifier;
@@ -24,6 +27,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Xml.Linq;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -33,6 +37,7 @@ public sealed partial class CargoSystem
     [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSys = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _sharedSolutionContainer = default!;
+    [Dependency] private readonly JobNetSystem _jobNet = default!;
     private static readonly ProtoId<NameIdentifierGroupPrototype> BountyNameIdentifierGroup = "Bounty";
 
     private EntityQuery<StackComponent> _stackQuery;
@@ -54,7 +59,19 @@ private void InitializeBounty()
         _bountyLabelQuery = GetEntityQuery<CargoBountyLabelComponent>();
     }
 
+    public int GetSectorDevelopment()
+    {
+        int total = 0;
+        var stations = new List<EntityUid>();
+        var query = EntityQueryEnumerator<TradeStationComponent>();
+        while (query.MoveNext(out var ent, out var comp))
+        {
+            var level = GetTradeStationLevel(ent, comp);
+            total += level?.Level ?? 0;
+        }
 
+        return total;
+    }
     private InfrastructureLevelPrototype? GetTradeStationLevel(EntityUid uid, TradeStationComponent tradeStation)
     {
         InfrastructureLevelPrototype? foundLevel = null;
@@ -70,6 +87,10 @@ private void InitializeBounty()
         return foundLevel;
     }
 
+    private void CompleteDealerObjective(EntityUid ui)
+    {
+
+    }
     private void UiUpdate(EntityUid uid, CargoBountyConsoleComponent component)
     {
         Dictionary<int, string> possibleTrades = new();
@@ -261,10 +282,20 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
         }
         if (database.CheckedBounties.Contains(component.Id))
             return;
+        CargoBountyData? bounty;
+        if(component.DealerName != null)
+        {
+            var jobNet = _jobNet.GetJobNetByName(component.DealerName);
+            if (jobNet == null)
+            {
+                return;
+            }
+            bounty = jobNet.DealerBounty;
+        }
 
-        if (!TryGetBountyFromId(station, component.Id, out var bounty, database))
+        else if (!TryGetBountyFromId(station, component.Id, out bounty, database))
             return;
-
+        if (bounty == null) return;
         if (!_protoMan.Resolve(bounty.Bounty, out var bountyPrototype))
             return;
 
@@ -309,7 +340,8 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
             args.Handled = true;
             database.CheckedBounties.Add(component.Id);
             // determine valid bounty items and pay based on them
-            var amount = _sharedSolutionContainer.GetTotalPrototypeQuantity(container.Owner, bountyPrototype.ReagentId);
+            var amount = _sharedSolutionContainer.GetTotalPrototypeQuantity(container.Owner, bountyPrototype.ReagentId.Value);
+            amount += GetContainerAmount(container.Owner, bountyPrototype.ReagentId.Value);
             var finalAmount = ((float)amount);
             var toSell = Math.Min(max, finalAmount);
             args.Price = toSell * bountyPrototype.Reward - _pricing.GetPrice(container.Owner);
@@ -327,8 +359,34 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
         }
     }
 
-    private void CompleteBounty(EntityUid station, CargoBountyData bounty, EntityUid? actor)
+    public FixedPoint2 GetContainerAmount(EntityUid uid, ProtoId<ReagentPrototype> chem)
     {
+        FixedPoint2 total = 0;
+
+        if (!TryComp<ContainerManagerComponent>(uid, out var containers))
+            return total;
+
+        foreach (var container in containers.Containers.Values)
+        {
+            foreach (var ent in container.ContainedEntities)
+            {
+                total += _sharedSolutionContainer.GetTotalPrototypeQuantity(ent, chem);
+            }
+        }
+        return total;
+    }
+    public void CompleteBounty(EntityUid station, CargoBountyData bounty, EntityUid? actor, string? dealerName)
+    {
+        if (dealerName != null)
+        {
+
+            var jobNet = _jobNet.GetJobNetByName(dealerName);
+            if (jobNet == null)
+            {
+                return;
+            }
+            _jobNet.CompleteDealerBounty(jobNet.Owner, jobNet);
+        }
         if (!_protoMan.Resolve(bounty.Bounty, out var proto))
             return;
         if (proto != null)
@@ -337,6 +395,7 @@ private void CompleteBounty(EntityUid station, CargoBountyData bounty, EntityUid
             if (tradeStation != null)
             {
                 tradeStation.ExperiencePoints += proto.SuccessXP;
+                if (tradeStation.ExperiencePoints < 0) tradeStation.ExperiencePoints = 0;
             }
         }
         TryRemoveBounty(station, bounty, false, actor);
@@ -350,10 +409,25 @@ 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))
+            CargoBountyData? bounty;
+            if(component.AssociatedStationId is not { } station)
+            {
+                return;
+            }
+            if (component.DealerName != null)
+            {
+                var jobNet = _jobNet.GetJobNetByName(component.DealerName);
+                if (jobNet == null)
+                {
+                    return;
+                }
+                bounty = jobNet.DealerBounty;
+            }
+            else if (!TryGetBountyFromId(station, component.Id, out bounty))
             {
                 continue;
             }
+            if (bounty == null) return;
             if (!_protoMan.Resolve(bounty.Bounty, out var bountyProto))
             {
                 continue;
@@ -367,14 +441,7 @@ private void OnSold(ref EntitySoldEvent args)
                 var faction = _station.GetOwningStation(station);
                 if (faction != null && _protoMan.Resolve(bounty.Bounty, out var proto))
                 {
-                    if (proto != null)
-                    {
-                        TryComp<TradeStationComponent>(station, out var tradeStation);
-                        if (tradeStation != null)
-                        {
-                            tradeStation.ExperiencePoints += proto.SuccessXP;
-                        }
-                    }
+                    CompleteBounty(station, bounty, args.Station, component.DealerName);
                 }
                 TryRemoveBounty(station, bounty, false);
                 _adminLogger.Add(LogType.Action, LogImpact.Low, $"Bounty \"{bounty.Bounty}\" (id:{bounty.Id}) was fulfilled");
@@ -399,7 +466,7 @@ private void OnSold(ref EntitySoldEvent args)
                 var toSell = Math.Min(max, totalSold);
                 if (toSell >= max)
                 {
-                    CompleteBounty(station, bounty, args.Station);
+                    CompleteBounty(station, bounty, args.Station, component.DealerName);
 
                 }
                 else
@@ -414,11 +481,12 @@ private void OnSold(ref EntitySoldEvent args)
                 var max = bountyProto.Entries.FirstOrDefault().Amount - bounty.AmountCompleted;
                 // determine valid bounty items and pay based on them
                 var amount = _sharedSolutionContainer.GetTotalPrototypeQuantity(sold, bountyProto.ReagentId);
+                amount += GetContainerAmount(sold, bountyProto.ReagentId.Value);
                 var finalAmount = ((float)amount);
                 var toSell = Math.Min(max, finalAmount);
                 if (toSell >= max)
                 {
-                    CompleteBounty(station, bounty, args.Station);
+                    CompleteBounty(station, bounty, args.Station, component.DealerName  );
                 }
                 else
                 {
@@ -437,7 +505,7 @@ private void OnSold(ref EntitySoldEvent args)
                 var toSell = Math.Min(max, finalAmount);
                 if (toSell >= max)
                 {
-                    CompleteBounty(station, bounty, args.Station);
+                    CompleteBounty(station, bounty, args.Station, component.DealerName);
                 }
                 else
                 {
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 3b076e35dcf..62f59a3d320 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -1004,7 +1004,7 @@ private bool FulfillNextOrder(StationCargoOrderDatabaseComponent orderDB, ProtoI
         /// <summary>
         /// Fulfills the specified cargo order and spawns paper attached to it.
         /// </summary>
-        private bool FulfillOrder(CargoOrderData order, ProtoId<CargoAccountPrototype> account, EntityCoordinates spawn, string? paperProto, string? personalAccount = null)
+        public bool FulfillOrder(CargoOrderData order, ProtoId<CargoAccountPrototype> account, EntityCoordinates spawn, string? paperProto, string? personalAccount = null)
         {
             if (!_protoMan.Resolve(order.Product, out var product))
                 return false;
diff --git a/Content.Server/CrewAssignments/AdminUI/CodexEui.cs b/Content.Server/CrewAssignments/AdminUI/CodexEui.cs
index abf86c0fdb2..88a13643e16 100644
--- a/Content.Server/CrewAssignments/AdminUI/CodexEui.cs
+++ b/Content.Server/CrewAssignments/AdminUI/CodexEui.cs
@@ -30,8 +30,8 @@ public override void Opened()
 
     public override CodexEuiState GetNewState()
     {
-        if (_crewMeta.MetaRecords == null) return new CodexEuiState(new List<CodexEntry>());
-        return new CodexEuiState(_crewMeta.MetaRecords.CodexEntries);
+        if (_crewMeta.MetaRecords == null) return new CodexEuiState(new List<CodexEntry>(), "");
+        return new CodexEuiState(_crewMeta.MetaRecords.CodexEntries, _crewMeta.MetaRecords.SectorStatus);
     }
 
     public override void HandleMessage(EuiMessageBase msg)
@@ -58,6 +58,12 @@ public override void HandleMessage(EuiMessageBase msg)
                 }
             case CodexEuiMsg.Save saveData:
                 {
+                    if(saveData.ID == -1)
+                    {
+                        _crewMeta.MetaRecords.SectorStatus = saveData.Description;
+                        _chat.DispatchGlobalAnnouncement($"The Sector Status has changed!", "Sector Status");
+                        break;
+                    }
                     foreach (var entry in _crewMeta.MetaRecords.CodexEntries)
                     {
                         if (entry.ID == saveData.ID)
diff --git a/Content.Server/CrewAssignments/Systems/JobNetSystem.Ui.cs b/Content.Server/CrewAssignments/Systems/JobNetSystem.Ui.cs
index b9a306e53d9..98c9034486a 100644
--- a/Content.Server/CrewAssignments/Systems/JobNetSystem.Ui.cs
+++ b/Content.Server/CrewAssignments/Systems/JobNetSystem.Ui.cs
@@ -122,6 +122,8 @@ public void UpdateUserInterface(EntityUid? user, EntityUid jobnet, JobNetCompone
         var spendAuth = false;
         var spent = 0;
         var spendable = 0;
+        var sectorChaos = 0;
+        var sectorStatus = "";
         foreach (var station in stations)
         {
             if (TryComp<CrewRecordsComponent>(station, out var crewRecord) && crewRecord != null)
@@ -180,6 +182,8 @@ public void UpdateUserInterface(EntityUid? user, EntityUid jobnet, JobNetCompone
             {
                 currentLevel = record.Level;
             }
+            sectorChaos = _meta.MetaRecords.SectorChaos;
+            sectorStatus = _meta.MetaRecords.SectorStatus;
         }
         else
         {
@@ -189,7 +193,20 @@ public void UpdateUserInterface(EntityUid? user, EntityUid jobnet, JobNetCompone
         }
         var balance = 0;
         _bank.TryGetBalance(user.Value, out balance);
-        var state = new JobNetUpdateState(possibleStations, assignmentName, wage, selectedstation, remainingTime, currentObjectives, completedObjectives, codexEntries, currentLevel, balance, spendAuth, spent, spendable, component.Precursor, component.PrecursorObjectives, component.PrecursorResetTime, component.RogueLevel, component.XP, component.NetworkType);
+        string? stationName = null;
+        if(component.DealerBounty != null)
+        {
+            if(component.DealerBounty.TradeStationUID != 0)
+            {
+                var ts = _cargo.GetTradeStationByID(component.DealerBounty.TradeStationUID);
+                if (ts != null)
+                {
+                    stationName = Name(ts.Value);
+                }
+            }
+        }
+
+        var state = new JobNetUpdateState(possibleStations, assignmentName, wage, selectedstation, remainingTime, currentObjectives, completedObjectives, codexEntries, currentLevel, balance, spendAuth, spent, spendable, component.Precursor, component.PrecursorObjectives, component.PrecursorResetTime, component.RogueLevel, component.XP, component.NetworkType, component.SecretPhrase, component.KillTarget, component.DealerBounty, stationName, component.RogueNetResetTime, sectorChaos, _cargo.GetSectorDevelopment(), sectorStatus);
         _ui.SetUiState(jobnet, JobNetUiKey.Key, state);
     }
 
diff --git a/Content.Server/CrewAssignments/Systems/JobNetSystem.cs b/Content.Server/CrewAssignments/Systems/JobNetSystem.cs
index 766d2263aa1..8ff8c744fc6 100644
--- a/Content.Server/CrewAssignments/Systems/JobNetSystem.cs
+++ b/Content.Server/CrewAssignments/Systems/JobNetSystem.cs
@@ -1,25 +1,46 @@
 using Content.Server._NF.Bank;
 using Content.Server.Access.Systems;
+using Content.Server.Cargo.Components;
+using Content.Server.Cargo.Systems;
 using Content.Server.Chat.Managers;
+using Content.Server.Codewords;
 using Content.Server.CrewManifest;
+using Content.Server.CrewRecords.Systems;
+using Content.Server.Database;
+using Content.Server.DoAfter;
+using Content.Server.Interaction;
+using Content.Server.NameIdentifier;
+using Content.Shared.Access.Components;
 using Content.Shared.Cargo;
+using Content.Shared.Cargo.Components;
+using Content.Shared.Cargo.Prototypes;
 using Content.Shared.CrewAssignments;
 using Content.Shared.CrewAssignments.Components;
 using Content.Shared.CrewAssignments.Prototypes;
 using Content.Shared.CrewAssignments.Systems;
 using Content.Shared.CrewRecords.Components;
+using Content.Shared.Cuffs;
+using Content.Shared.Cuffs.Components;
+using Content.Shared.DoAfter;
 using Content.Shared.Implants.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
 using Content.Shared.Precursor;
 using Content.Shared.Station.Components;
 using Content.Shared.StatusEffectNew.Components;
 using Content.Shared.UserInterface;
+using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Physics.Dynamics.Joints;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Linq;
-using static System.Collections.Specialized.BitVector32;
+using static Content.Shared.Access.Components.AccessOverriderComponent;
+using static Content.Shared.Access.Systems.SharedAccessOverriderSystem;
 
 namespace Content.Server.CrewAssignments.Systems;
 
@@ -33,37 +54,27 @@ public sealed partial class JobNetSystem : SharedJobNetSystem
     [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedCargoSystem _cargo = default!;
+    [Dependency] private readonly CargoSystem _cargo = default!;
     [Dependency] private readonly CrewManifestSystem _crewManifest = default!;
     [Dependency] private readonly IdCardSystem _card = default!;
-
+    [Dependency] private readonly CodewordSystem _codeword = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+    [Dependency] private readonly SharedCuffableSystem _cuffable = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!;
+    [Dependency] private readonly IGameTiming _timing2 = default!;
     public override void ReagentObjectiveComplete(JobNetComponent component, ProtoId<PrecursorObjectivePrototype> objective)
     {
         if (_proto.TryIndex(objective, out PrecursorObjectivePrototype? proto) && proto != null)
         {
             component.PrecursorObjectives.Remove(objective);
-            component.Precursor += proto.Reward;
-            component.XP += proto.Reward;
-            if (_proto.TryIndex(component.RogueLevel, out var rogueLevel))
-            {
-                if (rogueLevel.Next != null && _proto.TryIndex(rogueLevel.Next, out var nextLevel))
-                {
-                    if (component.XP >= nextLevel.Cost)
-                    {
-                        component.RogueLevel = nextLevel.ID;
-                    }
-                }
-            }
-
+            AwardPrecursor(component.Owner, component, proto.Reward);
             EntityUid? player = null;
-#pragma warning disable RA0030 // Consider using the non-generic variant of this method
-            if (TryComp<TransformComponent>(component.Owner, out var comp) && comp != null)
-            {
-                player = comp.ParentUid;
-            }
-#pragma warning restore RA0030 // Consider using the non-generic variant of this method
+            var comp = Transform(component.Owner);
+            player = comp.ParentUid;
             if (player == null) return;
-            _audio.PlayEntity(component.PaySuccessSound, player.Value, player.Value);
             if (TryComp<ActorComponent>(player, out var actor) && actor != null && actor.PlayerSession != null)
             {
                 var msg = $"Precusor Objective Complete! {proto.Reward} precursor gained.";
@@ -91,12 +102,341 @@ public override void Initialize()
         SubscribeLocalEvent<JobNetComponent, JobNetSelectMessage>(OnSelect);
         SubscribeLocalEvent<JobNetComponent, JobNetPurchaseMessage>(OnPurchase);
         SubscribeLocalEvent<JobNetComponent, JobNetSelectRogueNetMessage>(OnSelectRogueNet);
+        SubscribeLocalEvent<JobNetComponent, JobNetPurchasePrecursorMessage>(OnPurchasePrecursor);
+        SubscribeLocalEvent<JobNetComponent, JobNetSubmitHuntMessage>(OnSubmitHunt);
+        SubscribeLocalEvent<JobNetComponent, JobNetSubmitHuntedMessage>(OnSubmitHunted);
+        SubscribeLocalEvent<JobNetComponent, JobNetDealerLabelMessage>(OnDealerLabel);
+        SubscribeLocalEvent<PrecursorExtractorComponent, AfterInteractEvent>(AfterInteractOn);
+        SubscribeLocalEvent<PrecursorExtractorComponent, PrecursorExtractorDoAfterEvent>(OnDoAfter);
+        
 
+        InitializeUi();
+    }
 
+    public void CompleteDealerBounty(EntityUid uid, JobNetComponent component)
+    {
+        if (component.DealerBounty == null) return;
+        var ts = _cargo.GetTradeStationByID(component.DealerBounty.TradeStationUID);
+        if (ts == null) return;
+        AwardPrecursor(uid, component, 500);
+        EntityUid? player = null;
+        var comp = Transform(uid);
+        player = comp.ParentUid;
+        if (player == null) return;
+        if (TryComp<ActorComponent>(player, out var actor) && actor != null && actor.PlayerSession != null)
+        {
+            var msg = $"You have completed the dealer bounty for {Name(ts.Value)}. 500 precursor gained.";
+            _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                msg,
+                msg,
+                player.Value,
+                false,
+                actor.PlayerSession.Channel
+                );
+        }
+        component.DealerBounty = null;
+        UpdateUserInterface(player, uid, component);
+    }
+    public JobNetComponent? GetJobNetByName(string name)
+    {
+        var query = EntityQueryEnumerator<JobNetComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            var tranform = Transform(uid);
+            var parent = tranform.ParentUid;
+            if (Name(parent) == name)
+            {
+                return comp;
+            }
+        }
+        return null;
+    }
 
-        InitializeUi();
+    private void OnDealerLabel(Entity<JobNetComponent> ent, ref JobNetDealerLabelMessage args)
+    {
+        if (ent.Comp.DealerBounty == null) return;
+        if (ent.Comp.NextPrintTime > _timing2.CurTime) return;
+        EntityUid? player = null;
+        if (TryComp<TransformComponent>(ent.Owner, out var comp) && comp != null)
+        {
+            player = comp.ParentUid;
+        }
+        if (!TryComp<ActorComponent>(player, out var actor) || actor == null || actor.PlayerSession == null) return;
+        var query = EntityQueryEnumerator<CargoTelepadComponent>();
+        var found = false;
+        var userMapPos = _transform.GetMapCoordinates(player.Value);
+        var ts = _cargo.GetTradeStationByID(ent.Comp.DealerBounty.TradeStationUID);
+        if (ts == null) return;
+        while (query.MoveNext(out var telepad, out var telepadcomp))
+        {
+            var targetMapPos = _transform.GetMapCoordinates(telepad);
+            var calculatedDistance = targetMapPos.Position - userMapPos.Position;
+            var total = calculatedDistance.Length();
+            if (total <= 3)
+            {
+                var teleTransform = Transform(telepad);
+                var newEntity = Spawn("PaperCargoBountyManifest", teleTransform.Coordinates);
+                ent.Comp.NextPrintTime = _timing2.CurTime + TimeSpan.FromSeconds(10);
+                _cargo.SetupBountyLabel(newEntity, ts.Value, ent.Comp.DealerBounty);
+                if(TryComp<CargoBountyLabelComponent>(newEntity, out var cbl))
+                {
+                    if(cbl != null)
+                    {
+                        cbl.DealerName = Name(player.Value);
+                    }
+                }
+                found = true;
+
+                break;
+            }
+        }
+        if (!found)
+        {
+            _audio.PlayEntity(ent.Comp.ErrorSound, player.Value, player.Value);
+            var msg = $"You must be next to a telepad to teleport the label.";
+            if (msg != null)
+                _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                    msg,
+                    msg,
+                    player.Value,
+                    false,
+                    actor.PlayerSession.Channel
+                    );
+            return;
+        }
+        UpdateUserInterface(args.Actor, ent.Owner, ent.Comp);
+    }
+
+    private void AwardPrecursor(EntityUid uid, JobNetComponent component, int amount)
+    {
+        component.Precursor += amount;
+        component.XP += amount;
+        EntityUid? player = null;
+        var comp = Transform(uid);
+        player = comp.ParentUid;
+        if (player == null) return;
+        _audio.PlayEntity(component.PaySuccessSound, player.Value, player.Value);
+        var meta = _meta.GetMetaRecordsComponent();
+        if (meta != null)
+            meta.SectorChaos += amount;
+        if (TryComp<ActorComponent>(player, out var actor) && actor != null && actor.PlayerSession != null)
+        {
+            var msg = $"You have been awarded {amount} precursor.";
+            _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                msg,
+                msg,
+                player.Value,
+                false,
+                actor.PlayerSession.Channel
+                );
+        }
+        if (_proto.TryIndex(component.RogueLevel, out var rogueLevel))
+        {
+            if (rogueLevel.Next != null && _proto.TryIndex(rogueLevel.Next, out var nextLevel))
+            {
+                if (component.XP >= nextLevel.Cost)
+                {
+                    component.RogueLevel = nextLevel.ID;
+                }
+            }
+        }
+    }
+    private void OnSubmitHunted(Entity<JobNetComponent> ent, ref JobNetSubmitHuntedMessage args)
+    {
+        if (args.ID == "") return;
+        var query = EntityQueryEnumerator<JobNetComponent>();
+        var player = Transform(ent).ParentUid;
+        if (player == EntityUid.Invalid) return;
+        if (!TryComp<ActorComponent>(player, out var actor) || actor.PlayerSession == null) return;
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if(comp.KillTarget == Name(player))
+            {
+                if(args.ID == comp.SecretPhrase)
+                {
+                    Compromise(uid, comp);
+                    HuntedCompleted(ent.Owner, ent.Comp);
+                    return;
+                }
+            }
+        }
+    }
+
+    private void OnSubmitHunt(Entity<JobNetComponent> ent, ref JobNetSubmitHuntMessage args)
+    {
+        if (args.ID == "") return;
+        if (ent.Comp.KillTarget == null) return;
+        var query = EntityQueryEnumerator<JobNetComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            var tx = Transform(uid);
+            var parent = tx.ParentUid;
+            if (Name(parent) == ent.Comp.KillTarget)
+            {
+                if (args.ID == comp.SecretPhrase)
+                {
+                    HuntCompleted(ent.Owner, ent.Comp);
+                    Compromise(uid, comp);
+                    return;
+                }
+            }
+        }
+    }
+
+    private void HuntCompleted(EntityUid uid, JobNetComponent component)
+    {
+        EntityUid? player = null;
+        var comp = Transform(uid);
+        player = comp.ParentUid;
+        if (player == null) return;
+        if (TryComp<ActorComponent>(player, out var actor) && actor != null && actor.PlayerSession != null)
+        {
+            var msg = $"You have completed the hunt.";
+            _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                msg,
+                msg,
+                player.Value,
+                false,
+                actor.PlayerSession.Channel
+                );
+        }
+        component.KillTarget = null;
+        AwardPrecursor(uid, component, 500);
+        UpdateUserInterface(player, uid, component);
+    }
+    private void HuntedCompleted(EntityUid uid, JobNetComponent component)
+    {
+        EntityUid? player = null;
+        var comp = Transform(uid);
+        player = comp.ParentUid;
+        if (player == null) return;
+        if (TryComp<ActorComponent>(player, out var actor) && actor != null && actor.PlayerSession != null)
+        {
+            var msg = $"You have compromised the person hunting you.";
+            _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                msg,
+                msg,
+                player.Value,
+                false,
+                actor.PlayerSession.Channel
+                );
+        }
+        AwardPrecursor(uid, component, 500);
+        UpdateUserInterface(player, uid, component);
+    }
+
+    private void Compromise(EntityUid uid, JobNetComponent component)
+    {
+        EntityUid? player = null;
+        var comp = Transform(uid);
+        player = comp.ParentUid;
+        if (player != null)
+        {
+            if(TryComp<ActorComponent>(player, out var actor) && actor != null && actor.PlayerSession != null)
+            {
+                var msg = $"You have been compromised. You must protect your secret phrase!";
+                _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                    msg,
+                    msg,
+                    player.Value,
+                    false,
+                    actor.PlayerSession.Channel
+                    );
+            }
+        }
+        component.KillTarget = null;
+        component.NetworkType = RogueNetworkType.None;
+        component.RogueLevel = "RogueLevel1";
+        component.XP = 0;
+        component.Precursor = Math.Max(0, component.Precursor-500);
+        UpdateUserInterface(player, uid, component);
+    }
+
+
+
+    private void AfterInteractOn(EntityUid uid, PrecursorExtractorComponent component, AfterInteractEvent args)
+    {
+        if (args.Target == null || !TryComp(args.Target, out ImplantedComponent? implanted))
+            return;
+
+        if (!_interactionSystem.InRangeUnobstructed(args.User, (EntityUid)args.Target))
+            return;
+
+        var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.DoAfter, new PrecursorExtractorDoAfterEvent(), uid, target: args.Target, used: uid)
+        {
+            BreakOnMove = true,
+            BreakOnDamage = true,
+            NeedHand = true,
+        };
+
+        _doAfterSystem.TryStartDoAfter(doAfterEventArgs);
     }
 
+    private void OnDoAfter(EntityUid uid, PrecursorExtractorComponent component, PrecursorExtractorDoAfterEvent args)
+    {
+        if (args.Handled || args.Cancelled)
+            return;
+        if(!TryComp<ActorComponent>(args.User, out var actor) || actor.PlayerSession == null)
+            return;
+
+        if (args.Args.Target != null)
+        {
+            var target = (EntityUid)args.Args.Target;
+            bool vulnerable = false;
+            if(TryComp<CuffableComponent>(target, out var cuffable) && cuffable != null)
+            {
+                if (_cuffable.IsCuffed((target,cuffable)))
+                {
+                    vulnerable = true;
+                }
+            }
+            
+            if (TryComp<MobStateComponent>(target, out var mobState))
+            {
+                if (mobState.CurrentState == MobState.Dead)
+                {
+                    vulnerable = true;
+                }
+                if (mobState.CurrentState == MobState.Critical)
+                {
+                    vulnerable = true;
+                }
+            }
+            if (vulnerable)
+            {
+                if (TryComp<ImplantedComponent>(target, out var implanted))
+                {
+                    foreach (var implant in implanted.ImplantContainer.ContainedEntities)
+                    {
+                        if (TryComp<JobNetComponent>(implant, out var comp))
+                        {
+                            var msg = $"The secret phrase for {Name(target)} is: {comp.SecretPhrase}";
+                            _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                            msg,
+                            msg,
+                            uid,
+                            false,
+                            actor.PlayerSession.Channel
+                            );
+                        }
+                    }
+                }
+            }
+            else
+            {
+                var msg = $"This target is not vulnerable to precursor extraction.";
+                _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                    msg,
+                    msg,
+                    uid,
+                    false,
+                    actor.PlayerSession.Channel
+                    );
+            }
+
+            args.Handled = true;
+        }
+    }
 
     private void OnPurchase(EntityUid uid, JobNetComponent component, JobNetPurchaseMessage args)
     {
@@ -181,6 +521,85 @@ private void OnSelect(EntityUid uid, JobNetComponent component, JobNetSelectMess
 
     }
 
+    private void OnPurchasePrecursor(EntityUid uid, JobNetComponent component, JobNetPurchasePrecursorMessage args)
+    {
+        EntityUid? player = null;
+        if (TryComp<TransformComponent>(uid, out var comp) && comp != null)
+        {
+            player = comp.ParentUid;
+        }
+        if (!TryComp<ActorComponent>(player, out var actor) || actor == null || actor.PlayerSession == null) return;
+        var prod = _proto.Index<CargoProductPrototype>(args.ID);
+        if (prod == null) return;
+        int requiredLevel = 0;
+        if (prod.Group == "syndicatemarket") requiredLevel = 1;
+        if (prod.Group == "syndicatemarket2") requiredLevel = 2;
+        if (prod.Group == "syndicatemarket3") requiredLevel = 3;
+        if (prod.Group == "syndicatemarket4") requiredLevel = 4;
+        var level = _proto.Index(component.RogueLevel);
+        if(level.ItemLevel < requiredLevel)
+        {
+            _audio.PlayEntity(component.ErrorSound, player.Value, player.Value);
+            var msg = $"You do not have the rogue level required to purchase this.";
+            if (msg != null)
+                _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                    msg,
+                    msg,
+                    player.Value,
+                    false,
+                    actor.PlayerSession.Channel
+                    );
+            return;
+        }
+        if(prod.Cost > component.Precursor)
+        {
+            _audio.PlayEntity(component.ErrorSound, player.Value, player.Value);
+            var msg = $"You have insufficent stored precursor. You need {prod.Cost-component.Precursor} more precursor.";
+            if (msg != null)
+                _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                    msg,
+                    msg,
+                    player.Value,
+                    false,
+                    actor.PlayerSession.Channel
+                    );
+            return;
+        }
+        var query = EntityQueryEnumerator<CargoTelepadComponent>();
+        var found = false;
+        var userMapPos = _transform.GetMapCoordinates(player.Value);
+        while (query.MoveNext(out var telepad, out var telepadcomp))
+        {
+            var targetMapPos = _transform.GetMapCoordinates(telepad);
+            var calculatedDistance = targetMapPos.Position - userMapPos.Position;
+            var total = calculatedDistance.Length();
+            if(total <= 3)
+            {
+                var teleTransform = Transform(telepad);
+                var newEntity = Spawn(prod.Product, teleTransform.Coordinates);
+                _audio.PlayEntity(component.PaySuccessSound, player.Value, player.Value);
+                component.Precursor -= prod.Cost;
+                found = true;
+                break;
+            }
+        }
+        if(!found)
+        {
+            _audio.PlayEntity(component.ErrorSound, player.Value, player.Value);
+            var msg = $"You must be next to a telepad to make purchases.";
+            if (msg != null)
+                _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications,
+                    msg,
+                    msg,
+                    player.Value,
+                    false,
+                    actor.PlayerSession.Channel
+                    );
+            return;
+        }
+        UpdateUserInterface(args.Actor, uid, component);
+    }
+
     private void OnSelectRogueNet(EntityUid uid, JobNetComponent component, JobNetSelectRogueNetMessage args)
     {
         if (component.NetworkType != RogueNetworkType.None) return;
@@ -239,6 +658,58 @@ private void OnImplantActivate(EntityUid uid, JobNetComponent component, OpenJob
         ToggleUi(args.Performer, uid, component);
     }
 
+    public void TryAssignRogueObjective(EntityUid user, JobNetComponent component)
+    {
+        component.KillTarget = null;
+        component.DealerBounty = null;
+        if (component.NetworkType == RogueNetworkType.BountyHunter || component.NetworkType == RogueNetworkType.Assassin)
+        {
+            var query = EntityQueryEnumerator<JobNetComponent>();
+            List<EntityUid> possibleTargets = new();
+            while (query.MoveNext(out var uid, out var comp))
+            {
+                if (comp == component) continue;
+                if (component.NetworkType == comp.NetworkType || comp.NetworkType == RogueNetworkType.None) continue;
+                possibleTargets.Add(uid);
+            }
+            if (possibleTargets.Count < 1) return;
+            var chosenTarget = _random.Pick(possibleTargets);
+            var tf = Transform(chosenTarget);
+            var parent = tf.ParentUid;
+            component.KillTarget = Name(parent);
+
+        }
+        else if (component.NetworkType == RogueNetworkType.Dealer)
+        {
+            List<CargoBountyPrototype> possible = new();
+            var query = EntityQueryEnumerator<TradeStationComponent>();
+            int tradeStationUID = 0;
+            List<TradeStationComponent> possibleTrade = new();
+            while (query.MoveNext(out var uid, out var comp))
+            {
+                if(TryComp<StationMemberComponent>(uid, out var sm))
+                {
+                    possibleTrade.Add(comp);
+                }
+            }
+            if (possibleTrade.Count < 1) return;
+            var chosenUID = _random.Pick(possibleTrade).UID;
+            foreach (var proto in _proto.EnumeratePrototypes<CargoBountyPrototype>())
+            {
+                if(proto.Group == "PrecursorBounty")
+                {
+                    possible.Add(proto);
+                }
+            }
+            if (possible.Count < 1) return;
+            var chosen = _random.Pick(possible);
+            _nameIdentifier.GenerateUniqueName(user, "Bounty", out var randomVal);
+            var newBounty = new CargoBountyData(chosen, randomVal);
+            newBounty.TradeStationUID = chosenUID;
+            component.DealerBounty = newBounty;
+        }
+
+    }
     public void TryAssignPrecursorObjective(EntityUid user, JobNetComponent component)
     {
         component.PrecursorObjectives.Clear();
@@ -264,10 +735,18 @@ public override void Update(float frameTime)
             comp.PrecursorResetTime -= TimeSpan.FromSeconds(frameTime);
             if (comp.PrecursorResetTime <= TimeSpan.Zero)
             {
-                comp.PrecursorResetTime = TimeSpan.FromMinutes(30);
+                var words = _codeword.GenerateCodewords("PersistenceCodewordGenerator");
+                comp.SecretPhrase = string.Join(" ", words);
+                comp.PrecursorResetTime = TimeSpan.FromMinutes(45);
                 TryAssignPrecursorObjective(uid, comp);
-
             }
+            comp.RogueNetResetTime -= TimeSpan.FromSeconds(frameTime);
+            if (comp.NetworkType != RogueNetworkType.None && comp.RogueNetResetTime <= TimeSpan.Zero)
+            {
+                comp.RogueNetResetTime = TimeSpan.FromMinutes(180);
+                TryAssignRogueObjective(uid, comp);
+            }
+
 
         }
         base.Update(frameTime);
@@ -283,12 +762,10 @@ public void TryPay(EntityUid user, JobNetComponent component)
             return;
         }
         EntityUid? player = null;
-#pragma warning disable RA0030 // Consider using the non-generic variant of this method
         if (TryComp<TransformComponent>(user, out var comp) && comp != null)
         {
             player = comp.ParentUid;
         }
-#pragma warning restore RA0030 // Consider using the non-generic variant of this method
         if (player == null) return;
         var name = Name(player.Value);
         if (TryComp<CrewRecordsComponent>(station, out var crewRecord) && crewRecord != null)
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
index 95d7f97bbe3..edacc13bda0 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
@@ -18,7 +18,7 @@ protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEf
                 entity.Comp.Seed.HarvestRepeat = HarvestType.Repeat;
                 break;
             case HarvestType.Repeat:
-                entity.Comp.Seed.HarvestRepeat = HarvestType.SelfHarvest;
+                entity.Comp.Seed.HarvestRepeat = HarvestType.NoRepeat;
                 break;
         }
     }
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index de50b0e7c05..0e92c4ecacb 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -8,6 +8,7 @@
 using Content.Server.Speech.Components;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.Bed.Cryostorage;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
@@ -305,43 +306,67 @@ private void SpawnPlayerPersistentLoad(ICommonSession player)
                 $"Player {player.Name} late joined as {character.Name:characterName}. Loaded char");
 
 
-
-            var possibleContainers = FindContSpawn();
-            if (possibleContainers.Count > 0)
+            var cryos = EntityQueryEnumerator<CryostorageComponent, TransformComponent>();
+            EntityCoordinates? personalSpawn = null;
+            while (cryos.MoveNext(out var uid, out var cryo, out var xform))
             {
-                _robustRandom.Shuffle(possibleContainers);
-                foreach (var (uid, spawnPoint, manager, xform) in possibleContainers)
+                if (!cryo.PersonalMode)
+                    continue;
+                if (cryo.PersonalName == Name(mob))
                 {
-                    if (!_container.TryGetContainer(uid, spawnPoint.ContainerId, out var container2, manager))
-                        continue;
-
-                    if (!_container.Insert(mob, container2, containerXform: xform))
-                        continue;
-
-                    var ev = new ContainerSpawnEvent(mob);
+                    var ev = new PersonalCryoEvent(false);
                     RaiseLocalEvent(uid, ref ev);
-
+                    personalSpawn = xform.Coordinates;
+                    cryo.PersonalOccupied = false;
+                    break;
                 }
             }
-
+            if (personalSpawn != null)
+            {
+                _transform.SetCoordinates(mob, personalSpawn.Value);
+            }
             else
             {
-                var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
-                var possiblePositions = new List<EntityCoordinates>();
-                while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
+                var possibleContainers = FindContSpawn();
+                if (possibleContainers.Count > 0)
                 {
-                    if (spawnPoint.SpawnType != SpawnPointType.LateJoin)
-                        continue;
+                    _robustRandom.Shuffle(possibleContainers);
+                    foreach (var (uid, spawnPoint, manager, xform) in possibleContainers)
+                    {
+                        if (!_container.TryGetContainer(uid, spawnPoint.ContainerId, out var container2, manager))
+                            continue;
 
-                    possiblePositions.Add(xform.Coordinates);
+                        if (!_container.Insert(mob, container2, containerXform: xform))
+                            continue;
+
+                        var spawnLoc = xform.Coordinates;
+                        _transform.SetCoordinates(mob, spawnLoc);
+                        break;
+                        //var ev = new ContainerSpawnEvent(mob);
+                        //RaiseLocalEvent(uid, ref ev);
+
+                    }
                 }
 
-                if (possiblePositions.Count <= 0)
-                    return;
+                else
+                {
+                    var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
+                    var possiblePositions = new List<EntityCoordinates>();
+                    while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
+                    {
+                        if (spawnPoint.SpawnType != SpawnPointType.LateJoin)
+                            continue;
+
+                        possiblePositions.Add(xform.Coordinates);
+                    }
 
-                var spawnLoc = _robustRandom.Pick(possiblePositions);
+                    if (possiblePositions.Count <= 0)
+                        return;
 
-                _transform.SetCoordinates(mob, spawnLoc);
+                    var spawnLoc = _robustRandom.Pick(possiblePositions);
+
+                    _transform.SetCoordinates(mob, spawnLoc);
+                }
             }
 
 
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 3c453d27f97..e9977e918b4 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -172,7 +172,7 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
             };
         }
         else
-            hasActiveServer = HasActiveServer(sourceMapId, channel.ID);
+            hasActiveServer = true;// HasActiveServer(sourceMapId, channel.ID);
 
         var radioQuery = EntityQueryEnumerator<ActiveRadioComponent, TransformComponent>();
         var encryptionID = 0;
diff --git a/Content.Server/Research/Systems/ResearchSystem.Client.cs b/Content.Server/Research/Systems/ResearchSystem.Client.cs
index ebbfd2d6992..e5793552ab7 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Client.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Client.cs
@@ -32,6 +32,13 @@ private void OnClientSelected(EntityUid uid, ResearchClientComponent component,
         // Validate that we can access this server.
         if (!GetServers(uid).Contains((serveruid.Value, serverComponent)))
             return;
+        
+        if(!_accessReader.IsAllowed(args.Actor, serveruid.Value))
+        {
+            UpdateClientInterface(uid, component);
+            return;
+        }
+        
 
         UnregisterClient(uid, component);
         RegisterClient(uid, serveruid.Value, component, serverComponent);
@@ -63,8 +70,8 @@ private void OnClientRegistrationChanged(EntityUid uid, ResearchClientComponent
 
     private void OnClientMapInit(EntityUid uid, ResearchClientComponent component, MapInitEvent args)
     {
-        if (GetServers(uid).FirstOrNull() is { } server)
-            RegisterClient(uid, server, component, server);
+        //if (GetServers(uid).FirstOrNull() is { } server)
+        //    RegisterClient(uid, server, component, server);
     }
 
     private void OnClientCompInit(EntityUid uid, ResearchClientComponent component, ComponentInit args)
diff --git a/Content.Server/Research/Systems/ResearchSystem.cs b/Content.Server/Research/Systems/ResearchSystem.cs
index 9097574be99..5618f8c8f96 100644
--- a/Content.Server/Research/Systems/ResearchSystem.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Radio.EntitySystems;
+using Content.Server.Station.Systems;
 using Content.Shared.Access.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Research.Components;
@@ -22,7 +23,7 @@ public sealed partial class ResearchSystem : SharedResearchSystem
         [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly RadioSystem _radio = default!;
-
+        [Dependency] private readonly StationSystem _station = default!;
         public override void Initialize()
         {
             base.Initialize();
@@ -85,7 +86,16 @@ public HashSet<Entity<ResearchServerComponent>> GetServers(EntityUid client)
 
             var set = new HashSet<Entity<ResearchServerComponent>>();
             _lookup.GetGridEntities(grid, set);
-            return set;
+            var final = new HashSet<Entity<ResearchServerComponent>>();
+            var clientStation = _station.GetOwningStation(client);
+            foreach (var thing in set)
+            {
+                if (_station.GetOwningStation(thing.Owner) == clientStation)
+                {
+                    final.Add(thing);
+                }
+            }
+            return final;
         }
 
         public override void Update(float frameTime)
diff --git a/Content.Server/Shuttles/Components/ThrusterComponent.cs b/Content.Server/Shuttles/Components/ThrusterComponent.cs
index 572ab11bb72..ccb10d15921 100644
--- a/Content.Server/Shuttles/Components/ThrusterComponent.cs
+++ b/Content.Server/Shuttles/Components/ThrusterComponent.cs
@@ -1,7 +1,9 @@
 using Content.Server.Shuttles.Systems;
 using Content.Shared.Damage;
+using Content.Shared.DeviceLinking;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using System.Numerics;
 
 namespace Content.Server.Shuttles.Components
@@ -68,6 +70,23 @@ public sealed partial class ThrusterComponent : Component
         /// </summary>
         [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
         public TimeSpan NextFire = TimeSpan.Zero;
+
+        /// <summary>
+        /// Load on the power network, in watts.
+        /// </summary>
+        public float OriginalLoad { get; set; } = 0;
+
+        /// <summary>
+        /// Togglable thrusters
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
+        public string OnPort = "On";
+
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
+        public string OffPort = "Off";
+
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
+        public string TogglePort = "Toggle";
     }
 
     public enum ThrusterType
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index be3a5c8f276..93e02bd9b28 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -8,8 +8,14 @@
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Power;
+using Content.Shared.Power.Components;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Temperature;
+using Content.Server.Power.Components;
+using Content.Server.Construction; // Frontier
+using Content.Server.Construction.Components; // Frontier
+using Content.Shared.Construction.Components; // Frontier
+using Content.Shared.DeviceLinking.Events; // Frontier
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Components;
@@ -30,6 +36,8 @@ public sealed class ThrusterSystem : EntitySystem
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly ConstructionSystem _construction = default!; // Frontier
+    [Dependency] private readonly SharedTransformSystem _transform = default!; // Frontier
     [Dependency] private readonly TurfSystem _turf = default!;
 
     // Essentially whenever thruster enables we update the shuttle's available impulses which are used for movement.
@@ -54,8 +62,35 @@ public override void Initialize()
         SubscribeLocalEvent<ThrusterComponent, ExaminedEvent>(OnThrusterExamine);
 
         SubscribeLocalEvent<ShuttleComponent, TileChangedEvent>(OnShuttleTileChange);
+        SubscribeLocalEvent<ThrusterComponent, SignalReceivedEvent>(OnSignalReceived); // Frontier
     }
 
+     // Frontier: signal handler
+    private void OnSignalReceived(EntityUid uid, ThrusterComponent component, ref SignalReceivedEvent args)
+    {
+        if (args.Port == component.OffPort)
+            component.Enabled = false;
+        else if (args.Port == component.OnPort)
+            component.Enabled = true;
+        else if (args.Port == component.TogglePort)
+            component.Enabled ^= true;
+        else
+            return; // Invalid port, don't change the thruster.
+
+        if (!component.Enabled)
+        {
+            if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != 0 && apcPower.Load != 1)
+                apcPower.Load = 1;
+            DisableThruster(uid, component);
+        }
+        else if (CanEnable(uid, component))
+        {
+            if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != apcPower.Load)
+                apcPower.Load = component.OriginalLoad;
+            EnableThruster(uid, component);
+        }
+    }
+    // End Frontier: signal handler
     private void OnThrusterExamine(EntityUid uid, ThrusterComponent component, ExaminedEvent args)
     {
         // Powered is already handled by other power components
@@ -142,11 +177,15 @@ private void OnActivateThruster(EntityUid uid, ThrusterComponent component, Acti
 
         if (!component.Enabled)
         {
+            if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != 0 && apcPower.Load != 1) // Frontier
+                apcPower.Load = 1;  // Frontier
             DisableThruster(uid, component);
             args.Handled = true;
         }
         else if (CanEnable(uid, component))
         {
+            if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad != apcPower.Load) // Frontier
+                apcPower.Load = component.OriginalLoad; // Frontier
             EnableThruster(uid, component);
             args.Handled = true;
         }
@@ -235,6 +274,12 @@ private void OnAnchorChange(EntityUid uid, ThrusterComponent component, ref Anch
 
     private void OnThrusterInit(EntityUid uid, ThrusterComponent component, ComponentInit args)
     {
+        // Frontier: togglable thrusters
+        if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower) && component.OriginalLoad == 0)
+        {
+            component.OriginalLoad = apcPower.Load;
+        }
+        // End Frontier: togglable thrusters
         _ambient.SetAmbience(uid, false);
 
         if (!component.Enabled)
@@ -467,7 +512,7 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<ThrusterComponent>();
         var curTime = _timing.CurTime;
 
-        while (query.MoveNext(out var comp))
+        while (query.MoveNext(out var ent, out var comp)) // Frontier: add out var ent
         {
             if (comp.NextFire > curTime)
                 continue;
@@ -597,4 +642,5 @@ private int GetFlagIndex(DirectionFlag flag)
     {
         return (int)Math.Log2((int)flag);
     }
+
 }
diff --git a/Content.Server/Speech/Components/GoblinAccentComponent.cs b/Content.Server/Speech/Components/GoblinAccentComponent.cs
new file mode 100644
index 00000000000..062392cb9aa
--- /dev/null
+++ b/Content.Server/Speech/Components/GoblinAccentComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.Speech.Components;
+
+[RegisterComponent]
+public sealed partial class GoblinAccentComponent : Component
+{
+
+}
diff --git a/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs b/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs
new file mode 100644
index 00000000000..6bc8b43affe
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+using System.Text.RegularExpressions;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class GoblinAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GoblinAccentComponent, AccentGetEvent>(OnAccent);;
+    }
+
+    // converts left word when typed into the right word. For example typing you becomes ye.
+    public string Accentuate(string message, GoblinAccentComponent component)
+    {
+        var msg = message;
+
+        msg = _replacement.ApplyReplacements(msg, "goblin");
+        return msg;
+    }
+
+    private void OnAccent(EntityUid uid, GoblinAccentComponent component, AccentGetEvent args)
+    {
+        args.Message = Accentuate(args.Message, component);
+    }
+}
diff --git a/Content.Server/_NF/Goblin/Components/GoblinComponent.cs b/Content.Server/_NF/Goblin/Components/GoblinComponent.cs
new file mode 100644
index 00000000000..35533e98cc3
--- /dev/null
+++ b/Content.Server/_NF/Goblin/Components/GoblinComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server._NF.Goblin.Components;
+
+[RegisterComponent]
+public sealed partial class GoblinComponent : Component
+{
+
+}
diff --git a/Content.Shared/Bed/Cryostorage/CryostorageComponent.cs b/Content.Shared/Bed/Cryostorage/CryostorageComponent.cs
index ffb1a19e470..b7cba093587 100644
--- a/Content.Shared/Bed/Cryostorage/CryostorageComponent.cs
+++ b/Content.Shared/Bed/Cryostorage/CryostorageComponent.cs
@@ -41,6 +41,15 @@ public sealed partial class CryostorageComponent : Component
     /// </summary>
     [DataField]
     public SoundSpecifier? RemoveSound = new SoundPathSpecifier("/Audio/Effects/teleport_departure.ogg");
+
+    [DataField]
+    public bool PersonalMode = false;
+
+    [DataField]
+    public string? PersonalName = null;
+
+    [DataField]
+    public bool PersonalOccupied = false;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
index 5493bfd6243..ff887d5bcc5 100644
--- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
+++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.NameModifier.EntitySystems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
@@ -26,6 +27,7 @@ public abstract class SharedCryostorageSystem : EntitySystem
     [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
     [Dependency] protected readonly SharedMindSystem Mind = default!;
     [Dependency] private readonly MetaDataSystem _meta = default!;
+    [Dependency] protected readonly NameModifierSystem _nameModifier = default!;
 
     protected EntityUid? PausedMap { get; private set; }
 
@@ -39,6 +41,8 @@ public override void Initialize()
         SubscribeLocalEvent<CryostorageComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
         SubscribeLocalEvent<CryostorageComponent, ComponentShutdown>(OnShutdownContainer);
         SubscribeLocalEvent<CryostorageComponent, CanDropTargetEvent>(OnCanDropTarget);
+        SubscribeLocalEvent<CryostorageComponent, PersonalCryoEvent>(OnPersonalCryo);
+        SubscribeLocalEvent<CryostorageComponent, RefreshNameModifiersEvent>(OnRefreshName);
 
         SubscribeLocalEvent<CryostorageContainedComponent, EntGotRemovedFromContainerMessage>(OnRemovedContained);
         SubscribeLocalEvent<CryostorageContainedComponent, ComponentShutdown>(OnShutdownContained);
@@ -48,6 +52,22 @@ public override void Initialize()
         Subs.CVar(_configuration, CCVars.GameCryoSleepRejoining, OnCvarChanged, true);
     }
 
+    private void OnRefreshName(Entity<CryostorageComponent> ent, ref RefreshNameModifiersEvent args)
+    {
+        if(ent.Comp.PersonalMode && ent.Comp.PersonalName != null)
+        {
+            args.AddModifier($"Personal Cryopod ({ent.Comp.PersonalName})", 1);
+        }
+    }
+
+    private void OnPersonalCryo(Entity<CryostorageComponent> ent, ref PersonalCryoEvent args)
+    {
+        ent.Comp.PersonalOccupied = args.state;
+        _appearance.SetData(ent, CryostorageVisuals.Full, args.state);
+        _nameModifier.RefreshNameModifiers(ent.Owner);
+
+    }
+
     private void OnCvarChanged(bool value)
     {
         CryoSleepRejoiningEnabled = value;
@@ -76,15 +96,35 @@ private void OnRemovedContainer(Entity<CryostorageComponent> ent, ref EntRemoved
         if (args.Container.ID != comp.ContainerId)
             return;
 
-        _appearance.SetData(ent, CryostorageVisuals.Full, args.Container.ContainedEntities.Count > 0);
+        if (ent.Comp.PersonalMode == true)
+        {
+            ent.Comp.PersonalName = null;
+
+        }
+        if(!ent.Comp.PersonalOccupied)
+            _appearance.SetData(ent, CryostorageVisuals.Full, args.Container.ContainedEntities.Count > 0);
     }
 
+    private void UpdatePersonalOccupied(Entity<CryostorageComponent> ent, bool occupied)
+    {
+        ent.Comp.PersonalOccupied = occupied;
+        _appearance.SetData(ent, CryostorageVisuals.Full, occupied);
+    }
     private void OnInsertAttempt(Entity<CryostorageComponent> ent, ref ContainerIsInsertingAttemptEvent args)
     {
         var (_, comp) = ent;
         if (args.Container.ID != comp.ContainerId)
             return;
 
+        if(ent.Comp.PersonalMode == true)
+        {
+            if(ent.Comp.PersonalName != null && ent.Comp.PersonalName != Name(args.EntityUid))
+            {
+                args.Cancel();
+                return;
+            }
+        }
+
         if (_mobState.IsIncapacitated(args.EntityUid))
         {
             args.Cancel();
@@ -182,3 +222,7 @@ public bool IsInPausedMap(Entity<TransformComponent?> entity)
         return comp.MapUid != null && comp.MapUid == PausedMap;
     }
 }
+
+[ByRefEvent]
+public record struct PersonalCryoEvent(bool state);
+
diff --git a/Content.Shared/Cargo/CargoBountyData.cs b/Content.Shared/Cargo/CargoBountyData.cs
index 713841544fa..fd8b3e100da 100644
--- a/Content.Shared/Cargo/CargoBountyData.cs
+++ b/Content.Shared/Cargo/CargoBountyData.cs
@@ -29,6 +29,9 @@ public partial class CargoBountyData
     [DataField]
     public int AmountCompleted = 0;
 
+    [DataField]
+    public int TradeStationUID = 0;
+
     public CargoBountyData(CargoBountyPrototype bounty, int uniqueIdentifier)
     {
         Bounty = bounty.ID;
diff --git a/Content.Shared/Cargo/Prototypes/InfrastructureLevelPrototype.cs b/Content.Shared/Cargo/Prototypes/InfrastructureLevelPrototype.cs
index 80631e0e146..6076fd60288 100644
--- a/Content.Shared/Cargo/Prototypes/InfrastructureLevelPrototype.cs
+++ b/Content.Shared/Cargo/Prototypes/InfrastructureLevelPrototype.cs
@@ -31,4 +31,7 @@ public sealed partial class InfrastructureLevelPrototype : IPrototype
     [DataField]
     public int Income = -5000;
 
+    [DataField]
+    public int Level = 1;
+
 }
diff --git a/Content.Shared/CrewAssignments/Components/JobNetComponent.cs b/Content.Shared/CrewAssignments/Components/JobNetComponent.cs
index 1280a08eb04..29e6dbeb37f 100644
--- a/Content.Shared/CrewAssignments/Components/JobNetComponent.cs
+++ b/Content.Shared/CrewAssignments/Components/JobNetComponent.cs
@@ -1,9 +1,11 @@
+using Content.Shared.Cargo;
 using Content.Shared.CrewAssignments.Prototypes;
 using Content.Shared.Precursor;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.CrewAssignments.Components;
 
@@ -46,6 +48,14 @@ public sealed partial class JobNetComponent : Component
     [DataField]
     public string? KillTarget = null;
     [DataField]
-    public TimeSpan RougeNetResetTime = TimeSpan.Zero;
+    public TimeSpan RogueNetResetTime = TimeSpan.Zero;
+
+    [DataField]
+    public string SecretPhrase = "";
+    [DataField]
+    public CargoBountyData? DealerBounty = null;
+
+    [DataField("nextPrintTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextPrintTime = TimeSpan.Zero;
 }
 
diff --git a/Content.Shared/CrewAssignments/Components/PrecursorExtractorComponent.cs b/Content.Shared/CrewAssignments/Components/PrecursorExtractorComponent.cs
new file mode 100644
index 00000000000..d97eb45e7ad
--- /dev/null
+++ b/Content.Shared/CrewAssignments/Components/PrecursorExtractorComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.CrewAssignments.Prototypes;
+using Content.Shared.Precursor;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CrewAssignments.Components;
+
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PrecursorExtractorComponent : Component
+{
+    [DataField]
+    public TimeSpan DoAfter = TimeSpan.FromSeconds(5);
+}
+
diff --git a/Content.Shared/CrewAssignments/JobNetUi.cs b/Content.Shared/CrewAssignments/JobNetUi.cs
index 3749d1c51c2..1e092d4c867 100644
--- a/Content.Shared/CrewAssignments/JobNetUi.cs
+++ b/Content.Shared/CrewAssignments/JobNetUi.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Cargo;
 using Content.Shared.CrewAssignments.Components;
 using Content.Shared.CrewAssignments.Prototypes;
 using Content.Shared.CrewAssignments.Systems;
@@ -35,7 +36,15 @@ public sealed class JobNetUpdateState : BoundUserInterfaceState
     public ProtoId<RogueLevelPrototype> RogueLevel;
     public int XP;
     public RogueNetworkType NetworkType;
-    public JobNetUpdateState(Dictionary<int, string>? stations, string? assignmentName, int? wage, int selectedStation, TimeSpan? remainingMinutes, List<WorldObjectivesEntry> currentObjectives, List<WorldObjectivesEntry> completedObjectives, List<CodexEntry> codexEntries, ProtoId<NetworkLevelPrototype> level, int balance, bool spendAuth, int spent, int spendable, int precursor, List<ProtoId<PrecursorObjectivePrototype>> objectives, TimeSpan precursorResetTime, ProtoId<RogueLevelPrototype> rogueLevel, int xP, RogueNetworkType networkType)
+    public string SecretPhrase;
+    public string? KillTarget;
+    public CargoBountyData? DealerObjective;
+    public string? DealerObjectiveStation;
+    public TimeSpan RogueObjectiveResetTime;
+    public int SectorChaos;
+    public int SectorDevelopment;
+    public string SectorStatus;
+    public JobNetUpdateState(Dictionary<int, string>? stations, string? assignmentName, int? wage, int selectedStation, TimeSpan? remainingMinutes, List<WorldObjectivesEntry> currentObjectives, List<WorldObjectivesEntry> completedObjectives, List<CodexEntry> codexEntries, ProtoId<NetworkLevelPrototype> level, int balance, bool spendAuth, int spent, int spendable, int precursor, List<ProtoId<PrecursorObjectivePrototype>> objectives, TimeSpan precursorResetTime, ProtoId<RogueLevelPrototype> rogueLevel, int xP, RogueNetworkType networkType, string secretPhrase, string? killTarget, CargoBountyData? bountyData, string? stationName, TimeSpan rogueReset, int sectorChaos, int sectorDevelopment, string sectorStatus)
     {
         Stations = stations;
         AssignmentName = assignmentName;
@@ -56,6 +65,14 @@ public JobNetUpdateState(Dictionary<int, string>? stations, string? assignmentNa
         RogueLevel = rogueLevel;
         XP = xP;
         NetworkType = networkType;
+        SecretPhrase = secretPhrase;
+        KillTarget = killTarget;
+        DealerObjective = bountyData;
+        DealerObjectiveStation = stationName;
+        RogueObjectiveResetTime = rogueReset;
+        SectorChaos = sectorChaos;
+        SectorDevelopment = sectorDevelopment;
+        SectorStatus = sectorStatus;
     }
 }
 
@@ -94,3 +111,50 @@ public JobNetSelectRogueNetMessage(RogueNetworkType net)
         Net = net;
     }
 }
+
+
+[Serializable, NetSerializable]
+public sealed class JobNetDealerLabelMessage : BoundUserInterfaceMessage
+{
+    public string ID;
+    public JobNetDealerLabelMessage(string id)
+    {
+        ID = id;
+    }
+}
+
+
+[Serializable, NetSerializable]
+public sealed class JobNetPurchasePrecursorMessage : BoundUserInterfaceMessage
+{
+    public string ID;
+    public JobNetPurchasePrecursorMessage(string id)
+    {
+        ID = id;
+    }
+}
+
+
+
+[Serializable, NetSerializable]
+public sealed class JobNetSubmitHuntMessage : BoundUserInterfaceMessage
+{
+    public string ID;
+    public JobNetSubmitHuntMessage(string id)
+    {
+        ID = id;
+    }
+}
+
+
+
+[Serializable, NetSerializable]
+public sealed class JobNetSubmitHuntedMessage : BoundUserInterfaceMessage
+{
+    public string ID;
+    public JobNetSubmitHuntedMessage(string id)
+    {
+        ID = id;
+    }
+}
+
diff --git a/Content.Shared/CrewAssignments/Prototypes/RogueLevelPrototype.cs b/Content.Shared/CrewAssignments/Prototypes/RogueLevelPrototype.cs
index 919517167ec..b48035f30bc 100644
--- a/Content.Shared/CrewAssignments/Prototypes/RogueLevelPrototype.cs
+++ b/Content.Shared/CrewAssignments/Prototypes/RogueLevelPrototype.cs
@@ -27,9 +27,16 @@ public sealed partial class RogueLevelPrototype : IPrototype
     public int Cost = 0;
 
     /// <summary>
-    /// What RogueLevel is the next available to purchase
+    /// What RogueLevel is the next to level into
     /// </summary>
     [DataField]
     public ProtoId<RogueLevelPrototype>? Next = null;
 
+    /// <summary>
+    /// What level of items are available for purchase
+    /// </summary>
+    [DataField]
+    public int ItemLevel = 0;
+
+
 }
diff --git a/Content.Shared/CrewAssignments/Systems/CodexEui.cs b/Content.Shared/CrewAssignments/Systems/CodexEui.cs
index 00344f5d3c5..6de7621b355 100644
--- a/Content.Shared/CrewAssignments/Systems/CodexEui.cs
+++ b/Content.Shared/CrewAssignments/Systems/CodexEui.cs
@@ -7,10 +7,12 @@ namespace Content.Shared.CrewAssignments.Systems;
 public sealed class CodexEuiState : EuiStateBase
 {
     public List<CodexEntry> Entries { get; }
+    public string SectorStatus { get; }
 
-    public CodexEuiState(List<CodexEntry> entries)
+    public CodexEuiState(List<CodexEntry> entries, string sectorStatus)
     {
         Entries = entries;
+        SectorStatus = sectorStatus;
     }
 }
 [DataDefinition, NetSerializable, Serializable]
@@ -117,6 +119,12 @@ public sealed class Close : EuiMessageBase
     public sealed class CreateNew : EuiMessageBase
     {
     }
+
+    [Serializable, NetSerializable]
+    public sealed class SectorButton : EuiMessageBase
+    {
+    }
+
     [Serializable, NetSerializable]
     public sealed class SaveChangesCompleted : EuiMessageBase
     {
diff --git a/Content.Shared/CrewAssignments/Systems/SharedJobNetSystem.cs b/Content.Shared/CrewAssignments/Systems/SharedJobNetSystem.cs
index 46a43048d6f..f9629171506 100644
--- a/Content.Shared/CrewAssignments/Systems/SharedJobNetSystem.cs
+++ b/Content.Shared/CrewAssignments/Systems/SharedJobNetSystem.cs
@@ -1,8 +1,10 @@
 using Content.Shared.CrewAssignments.Components;
+using Content.Shared.DoAfter;
 using Content.Shared.Precursor;
 using Content.Shared.StatusEffectNew.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using System;
 using System.Collections.Generic;
@@ -69,5 +71,13 @@ public void ReagentObjectiveTryComplete(JobNetComponent component, Entity<Status
             }
         }
     }
+    [Serializable, NetSerializable]
+    public sealed partial class PrecursorExtractorDoAfterEvent : DoAfterEvent
+    {
+        public PrecursorExtractorDoAfterEvent()
+        {
+        }
 
+        public override DoAfterEvent Clone() => this;
+    }
 }
diff --git a/Content.Shared/CrewMetaRecords/Components/CrewMetaRecordsComponent.cs b/Content.Shared/CrewMetaRecords/Components/CrewMetaRecordsComponent.cs
index 92418bcc1c9..7a385ac3c7f 100644
--- a/Content.Shared/CrewMetaRecords/Components/CrewMetaRecordsComponent.cs
+++ b/Content.Shared/CrewMetaRecords/Components/CrewMetaRecordsComponent.cs
@@ -9,7 +9,10 @@ namespace Content.Shared.CrewMetaRecords;
 [AutoGenerateComponentState]
 public sealed partial class CrewMetaRecordsComponent : Component
 {
-
+    [DataField]
+    public string SectorStatus = "";
+    [DataField]
+    public int SectorChaos = 0;
     [DataField]
     public int NextObjectiveID = 1;
     [DataField]
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index f03f07b5472..4d7cd1ba78a 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -99,10 +99,16 @@ protected virtual void OnComponentInit(Entity<DoorComponent> ent, ref ComponentI
                 door.State = DoorState.Closed;
                 door.Partial = false;
             }
+            if (door.State == DoorState.Welded)
+            {
+                door.State = DoorState.Welded;
+                door.Partial = false;
+            }
         }
 
         // should this door have collision and the like enabled?
         var collidable = door.State == DoorState.Closed
+            || door.State == DoorState.Welded
             || door.State == DoorState.Closing && door.Partial
             || door.State == DoorState.Opening && !door.Partial;
 
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
index c617c05b334..b9fcab5d41d 100644
--- a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
@@ -18,5 +18,5 @@ public sealed partial class PlantMutateExudeGases : EntityEffectBase<PlantMutate
     public float MinValue = 0.01f;
 
     [DataField]
-    public float MaxValue = 0.5f;
+    public float MaxValue = 0.1f;
 }
diff --git a/Content.Shared/SmartFridge/SmartFridgeComponent.cs b/Content.Shared/SmartFridge/SmartFridgeComponent.cs
index d45d315da8b..5a393c732a7 100644
--- a/Content.Shared/SmartFridge/SmartFridgeComponent.cs
+++ b/Content.Shared/SmartFridge/SmartFridgeComponent.cs
@@ -42,7 +42,7 @@ public sealed partial class SmartFridgeComponent : Component
     /// <summary>
     /// A mapping of smart fridge entries to the actual contained contents
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [AutoNetworkedField]
     [Access(typeof(SharedSmartFridgeSystem), Other = AccessPermissions.ReadExecute)]
     public Dictionary<SmartFridgeEntry, HashSet<NetEntity>> ContainedEntries = new();
 
diff --git a/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs b/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
index d869c96d31c..fa4c980b8df 100644
--- a/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
+++ b/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
@@ -13,5 +13,5 @@ public sealed partial class SprayPainterAmmoComponent : Component
     /// The value by which the charge in the spray painter will be recharged.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public int Charges = 15;
+    public int Charges = 30;
 }
diff --git a/Resources/Audio/Ambience/Further_Out_Now.ogg b/Resources/Audio/Ambience/Further_Out_Now.ogg
new file mode 100644
index 00000000000..302c12d6959
Binary files /dev/null and b/Resources/Audio/Ambience/Further_Out_Now.ogg differ
diff --git a/Resources/Audio/Lobby/Welcome_To_The_Threshold.ogg b/Resources/Audio/Lobby/Welcome_To_The_Threshold.ogg
new file mode 100644
index 00000000000..046aec46b0f
Binary files /dev/null and b/Resources/Audio/Lobby/Welcome_To_The_Threshold.ogg differ
diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
index af02cb4f1f9..8e89ebb63e1 100644
--- a/Resources/Audio/Lobby/attributions.yml
+++ b/Resources/Audio/Lobby/attributions.yml
@@ -80,3 +80,8 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "every light is blinking at once by Sunbeamstress/Lauren Loveless."
   source: "https://soundcloud.com/sunbeamstress/every-light-is-blinking-at-once"
+
+- files: ["Welcome_To_The_Threshold.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Welcome To The Threshold by mrjajkes"
+  source: "https://www.youtube.com/watch?v=CSf3qnKjN44"
diff --git a/Resources/Audio/_NF/Voice/Goblin/attributions.yml b/Resources/Audio/_NF/Voice/Goblin/attributions.yml
new file mode 100644
index 00000000000..5da1cf34088
--- /dev/null
+++ b/Resources/Audio/_NF/Voice/Goblin/attributions.yml
@@ -0,0 +1,32 @@
+- files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
+- files: ["goblin-cackle-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/spookymodem/sounds/202096/"
+- files: ["goblin-cackle-05.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
+  source: "https://freesound.org/people/Nanakisan/sounds/253532/"
+- files: ["goblin-scream-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
+- files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/Duisterwho/sounds/643497/"
+- files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: https://freesound.org/people/SnowFightStudios/sounds/643657/
+- files: ["goblin-chatter-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
+  source: https://freesound.org/people/Fenodyrie/sounds/565923/
+- files: ["goblin-hiss-01.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
+  source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg
new file mode 100644
index 00000000000..74d3e2e0555
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg
new file mode 100644
index 00000000000..42587638db5
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg
new file mode 100644
index 00000000000..7db2a2f7bea
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg
new file mode 100644
index 00000000000..1b9d67543c7
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg
new file mode 100644
index 00000000000..8d98dbda60d
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg
new file mode 100644
index 00000000000..4f236f781dc
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cry-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-01.ogg
new file mode 100644
index 00000000000..a2fb7901674
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cry-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-02.ogg
new file mode 100644
index 00000000000..a6e765ef487
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-02.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg
new file mode 100644
index 00000000000..563a6a8cb9a
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-01.ogg
new file mode 100644
index 00000000000..d30730dd273
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-02.ogg
new file mode 100644
index 00000000000..740e0d09733
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-02.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-03.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-03.ogg
new file mode 100644
index 00000000000..84fe764d040
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-03.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-04.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-04.ogg
new file mode 100644
index 00000000000..f55d83810a9
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-04.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/license.txt b/Resources/Audio/_NF/Voice/Goblin/license.txt
new file mode 100644
index 00000000000..824f0bdbeda
--- /dev/null
+++ b/Resources/Audio/_NF/Voice/Goblin/license.txt
@@ -0,0 +1,32 @@
+- files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
+- files: ["goblin-cackle-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/spookymodem/sounds/202096/"
+- files: ["goblin-cackle-05.ogg"]
+  license: "CC BY 4.0"
+  copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
+  source: "https://freesound.org/people/Nanakisan/sounds/253532/"
+- files: ["goblin-scream-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
+- files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/Duisterwho/sounds/643497/"
+- files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: https://freesound.org/people/SnowFightStudios/sounds/643657/
+- files: ["goblin-chatter-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
+  source: https://freesound.org/people/Fenodyrie/sounds/565923/
+- files: ["goblin-hiss-01.ogg"]
+  license: "CC BY 4.0"
+  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
+  source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/
diff --git a/Resources/Locale/en-US/_NF/accent/goblin_accent.ftl b/Resources/Locale/en-US/_NF/accent/goblin_accent.ftl
new file mode 100644
index 00000000000..1a7848827fb
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/accent/goblin_accent.ftl
@@ -0,0 +1,737 @@
+# a mix of cockney and cant (rogue/vagabond slang)
+# cockney: https://www.eastlondonhistory.co.uk/history-east-end-cockney/   (th -> f/v, tt -> ', er -> ah, -ing -> -in')
+# cant: https://www.gutenberg.org/files/47018/47018-h/47018-h.htm
+
+accent-goblin-words-1 = a lot
+accent-goblin-words-2 = airlock
+accent-goblin-words-3 = airlocks
+accent-goblin-words-4 = am
+accent-goblin-words-5 = am not
+accent-goblin-words-6 = an idea
+accent-goblin-words-7 = antag
+accent-goblin-words-8 = anything
+accent-goblin-words-9 = are
+accent-goblin-words-10 = are not
+accent-goblin-words-11 = aren’t
+accent-goblin-words-12 = arent
+accent-goblin-words-13 = arrest
+accent-goblin-words-14 = arrested
+accent-goblin-words-15 = arresting
+accent-goblin-words-16 = arrests
+accent-goblin-words-17 = attack
+accent-goblin-words-18 = attacked
+accent-goblin-words-19 = attacking
+accent-goblin-words-20 = attacks
+accent-goblin-words-21 = bag
+accent-goblin-words-22 = bags
+accent-goblin-words-23 = bailiff
+accent-goblin-words-24 = bailiffs
+accent-goblin-words-25 = beat
+accent-goblin-words-26 = beaten
+accent-goblin-words-27 = beating
+accent-goblin-words-28 = beats
+accent-goblin-words-29 = beer
+accent-goblin-words-30 = bocadillo
+accent-goblin-words-31 = bolt
+accent-goblin-words-32 = bolted
+accent-goblin-words-33 = boot
+accent-goblin-words-34 = boots
+accent-goblin-words-35 = booze
+accent-goblin-words-36 = bored
+accent-goblin-words-37 = boring
+accent-goblin-words-38 = bottle
+accent-goblin-words-39 = bottles
+accent-goblin-words-40 = boy
+accent-goblin-words-41 = boys
+accent-goblin-words-42 = brig
+accent-goblin-words-43 = brother
+accent-goblin-words-44 = brothers
+accent-goblin-words-45 = bullshit
+accent-goblin-words-46 = bullshitting
+accent-goblin-words-47 = bus
+accent-goblin-words-48 = captain
+accent-goblin-words-49 = captains
+accent-goblin-words-50 = cash
+accent-goblin-words-51 = centcom
+accent-goblin-words-52 = cheap
+accent-goblin-words-53 = cheater
+accent-goblin-words-54 = close
+accent-goblin-words-55 = closed
+accent-goblin-words-56 = closing
+accent-goblin-words-57 = clothes
+accent-goblin-words-58 = clown
+accent-goblin-words-59 = clowns
+accent-goblin-words-60 = command
+accent-goblin-words-61 = corpse
+accent-goblin-words-62 = crew
+accent-goblin-words-63 = crewman
+accent-goblin-words-64 = crewmember
+accent-goblin-words-65 = crewmen
+accent-goblin-words-66 = crime
+accent-goblin-words-67 = crimes
+accent-goblin-words-68 = crowbar
+accent-goblin-words-69 = crowbars
+accent-goblin-words-70 = cuff
+accent-goblin-words-71 = cuffed
+accent-goblin-words-72 = cuffing
+accent-goblin-words-73 = cuffs
+accent-goblin-words-74 = cut
+accent-goblin-words-75 = cuts
+accent-goblin-words-76 = cutting
+accent-goblin-words-77 = dead
+accent-goblin-words-78 = depot
+accent-goblin-words-79 = depots
+accent-goblin-words-80 = destroy
+accent-goblin-words-81 = destroyed
+accent-goblin-words-82 = destroying
+accent-goblin-words-83 = diner
+accent-goblin-words-84 = dock
+accent-goblin-words-85 = docks
+accent-goblin-words-86 = doctor
+accent-goblin-words-87 = door
+accent-goblin-words-88 = doors
+accent-goblin-words-89 = drink
+accent-goblin-words-90 = drinking
+accent-goblin-words-91 = drinks
+accent-goblin-words-92 = duffel
+accent-goblin-words-93 = duffel bag
+accent-goblin-words-94 = dwarf
+accent-goblin-words-95 = dwarves
+accent-goblin-words-96 = emitter
+accent-goblin-words-97 = everything
+accent-goblin-words-98 = experienced
+accent-goblin-words-99 = fast
+accent-goblin-words-100 = father
+accent-goblin-words-101 = fathers
+accent-goblin-words-102 = flies
+accent-goblin-words-103 = fly
+accent-goblin-words-104 = flying
+accent-goblin-words-105 = follow
+accent-goblin-words-106 = followed
+accent-goblin-words-107 = following
+accent-goblin-words-108 = follows
+accent-goblin-words-109 = food
+accent-goblin-words-110 = food ship
+accent-goblin-words-111 = food ships
+accent-goblin-words-112 = food shuttle
+accent-goblin-words-113 = food shuttles
+accent-goblin-words-114 = food truck
+accent-goblin-words-115 = food trucks
+accent-goblin-words-116 = fool
+accent-goblin-words-117 = foolish
+accent-goblin-words-118 = football
+accent-goblin-words-119 = fucking
+accent-goblin-words-120 = gave
+accent-goblin-words-121 = give
+accent-goblin-words-122 = gives
+accent-goblin-words-123 = giving
+accent-goblin-words-124 = going to
+accent-goblin-words-125 = gonna
+accent-goblin-words-126 = hammy
+accent-goblin-words-127 = hamper
+accent-goblin-words-128 = hampster
+accent-goblin-words-129 = hampter
+accent-goblin-words-130 = hamster
+accent-goblin-words-131 = hand
+accent-goblin-words-132 = handcuffs
+accent-goblin-words-133 = harass
+accent-goblin-words-134 = harasses
+accent-goblin-words-135 = harassing
+accent-goblin-words-136 = harassment
+accent-goblin-words-137 = harbour
+accent-goblin-words-138 = hard
+accent-goblin-words-139 = has
+accent-goblin-words-140 = has not
+accent-goblin-words-141 = hasn’t
+accent-goblin-words-142 = hasnt
+accent-goblin-words-143 = have
+accent-goblin-words-144 = have not
+accent-goblin-words-145 = haven’t
+accent-goblin-words-146 = havent
+accent-goblin-words-147 = he
+accent-goblin-words-148 = head
+accent-goblin-words-149 = heal
+accent-goblin-words-150 = healing
+accent-goblin-words-151 = hear
+accent-goblin-words-152 = heard
+accent-goblin-words-153 = hearing
+accent-goblin-words-154 = hears
+accent-goblin-words-155 = heat
+accent-goblin-words-156 = heaven
+accent-goblin-words-157 = helix
+accent-goblin-words-158 = hell
+accent-goblin-words-159 = hellish
+accent-goblin-words-160 = hello
+accent-goblin-words-161 = helmet
+accent-goblin-words-162 = her
+accent-goblin-words-163 = heresy
+accent-goblin-words-164 = heretical
+accent-goblin-words-165 = hers
+accent-goblin-words-166 = herself
+accent-goblin-words-167 = hey
+accent-goblin-words-168 = hi
+accent-goblin-words-169 = hide
+accent-goblin-words-170 = hideous
+accent-goblin-words-171 = high
+accent-goblin-words-172 = highly
+accent-goblin-words-173 = him
+accent-goblin-words-174 = himself
+accent-goblin-words-175 = hint
+accent-goblin-words-176 = hinting
+accent-goblin-words-177 = hints
+accent-goblin-words-178 = hire
+accent-goblin-words-179 = hired
+accent-goblin-words-180 = hires
+accent-goblin-words-181 = hiring
+accent-goblin-words-182 = his
+accent-goblin-words-183 = hiss
+accent-goblin-words-184 = hit
+accent-goblin-words-185 = hold
+accent-goblin-words-186 = holding
+accent-goblin-words-187 = holly
+accent-goblin-words-188 = honour
+accent-goblin-words-189 = hope
+accent-goblin-words-190 = horizon
+accent-goblin-words-191 = horror
+accent-goblin-words-192 = horrors
+accent-goblin-words-193 = hose
+accent-goblin-words-194 = hospital
+accent-goblin-words-195 = hospitaller
+accent-goblin-words-196 = hot
+accent-goblin-words-197 = hothead
+accent-goblin-words-198 = hotheaded
+accent-goblin-words-199 = hotshot
+accent-goblin-words-200 = how
+accent-goblin-words-201 = however
+accent-goblin-words-202 = human
+accent-goblin-words-203 = humans
+accent-goblin-words-204 = hurl
+accent-goblin-words-205 = hurt
+accent-goblin-words-206 = hurting
+accent-goblin-words-207 = hush
+accent-goblin-words-208 = ideas
+accent-goblin-words-209 = idiot
+accent-goblin-words-210 = in the know
+accent-goblin-words-211 = in trouble
+accent-goblin-words-212 = inexperienced
+accent-goblin-words-213 = is
+accent-goblin-words-214 = is not
+accent-goblin-words-215 = isn’t
+accent-goblin-words-216 = isnt
+accent-goblin-words-217 = jailer
+accent-goblin-words-218 = jailers
+accent-goblin-words-219 = jest
+accent-goblin-words-220 = jester
+accent-goblin-words-221 = jesters
+accent-goblin-words-222 = jests
+accent-goblin-words-223 = kill
+accent-goblin-words-224 = killed
+accent-goblin-words-225 = killing
+accent-goblin-words-226 = kills
+accent-goblin-words-227 = know
+accent-goblin-words-228 = knowing
+accent-goblin-words-229 = knowledgeable
+accent-goblin-words-230 = leg
+accent-goblin-words-231 = legs
+accent-goblin-words-232 = lemme
+accent-goblin-words-233 = lie
+accent-goblin-words-234 = lied
+accent-goblin-words-235 = lies
+accent-goblin-words-236 = little
+accent-goblin-words-237 = look
+accent-goblin-words-238 = looked
+accent-goblin-words-239 = looking
+accent-goblin-words-240 = looks
+accent-goblin-words-241 = lying
+accent-goblin-words-242 = man
+accent-goblin-words-243 = McCargo
+accent-goblin-words-244 = meat
+accent-goblin-words-245 = medic
+accent-goblin-words-246 = men
+accent-goblin-words-247 = merc
+accent-goblin-words-248 = mercenaries
+accent-goblin-words-249 = mercenary
+accent-goblin-words-250 = mercs
+accent-goblin-words-251 = money
+accent-goblin-words-252 = mother
+accent-goblin-words-253 = mothers
+accent-goblin-words-254 = mouth
+accent-goblin-words-255 = moving
+accent-goblin-words-256 = murder
+accent-goblin-words-257 = murdered
+accent-goblin-words-258 = murdering
+accent-goblin-words-259 = myself
+accent-goblin-words-260 = neat
+accent-goblin-words-261 = neato
+accent-goblin-words-262 = nfsd
+accent-goblin-words-263 = nice
+accent-goblin-words-264 = no sense
+accent-goblin-words-265 = nonsense
+accent-goblin-words-266 = nonsensical
+accent-goblin-words-267 = nsfd
+accent-goblin-words-268 = officer
+accent-goblin-words-269 = paper
+accent-goblin-words-270 = papers
+accent-goblin-words-271 = pay
+accent-goblin-words-272 = person
+accent-goblin-words-273 = pilot
+accent-goblin-words-274 = pirate
+accent-goblin-words-275 = pirates
+accent-goblin-words-276 = poor
+accent-goblin-words-277 = prison
+accent-goblin-words-278 = prowler
+accent-goblin-words-279 = quickly
+accent-goblin-words-280 = reporter
+accent-goblin-words-281 = reporters
+accent-goblin-words-282 = restaurant
+accent-goblin-words-283 = rich
+accent-goblin-words-284 = rob
+accent-goblin-words-285 = robbed
+accent-goblin-words-286 = run
+accent-goblin-words-287 = saw
+accent-goblin-words-288 = scientific
+accent-goblin-words-289 = scientist
+accent-goblin-words-290 = scientists
+accent-goblin-words-291 = sec
+accent-goblin-words-292 = seccie
+accent-goblin-words-293 = security
+accent-goblin-words-294 = see
+accent-goblin-words-295 = seeing
+accent-goblin-words-296 = seen
+accent-goblin-words-297 = shit
+accent-goblin-words-298 = shitter
+accent-goblin-words-299 = shoe
+accent-goblin-words-300 = shoes
+accent-goblin-words-301 = shut up
+accent-goblin-words-302 = shut your mouth
+accent-goblin-words-303 = shuttle
+accent-goblin-words-304 = shuttles
+accent-goblin-words-305 = sleep
+accent-goblin-words-306 = sleeping
+accent-goblin-words-307 = slime
+accent-goblin-words-308 = slimes
+accent-goblin-words-309 = smart
+accent-goblin-words-310 = smoke
+accent-goblin-words-311 = smoked
+accent-goblin-words-312 = smokes
+accent-goblin-words-313 = smoking
+accent-goblin-words-314 = soccer
+accent-goblin-words-315 = something
+accent-goblin-words-316 = speak
+accent-goblin-words-317 = speaking
+accent-goblin-words-318 = spesos
+accent-goblin-words-319 = spoke
+accent-goblin-words-320 = steal
+accent-goblin-words-321 = stealing
+accent-goblin-words-322 = stole
+accent-goblin-words-323 = stolen
+accent-goblin-words-324 = stop
+accent-goblin-words-325 = stupid
+accent-goblin-words-326 = syndi
+accent-goblin-words-327 = syndicate
+accent-goblin-words-328 = syndicates
+accent-goblin-words-329 = syndie
+accent-goblin-words-330 = syndies
+accent-goblin-words-331 = syndis
+accent-goblin-words-332 = take
+accent-goblin-words-333 = takes
+accent-goblin-words-334 = taking
+accent-goblin-words-335 = talk
+accent-goblin-words-336 = talking
+accent-goblin-words-337 = talks
+accent-goblin-words-338 = templar
+accent-goblin-words-339 = theft
+accent-goblin-words-340 = thief
+accent-goblin-words-341 = thieving
+accent-goblin-words-342 = thing
+accent-goblin-words-343 = think
+accent-goblin-words-344 = thinking
+accent-goblin-words-345 = thought
+accent-goblin-words-346 = thoughts
+accent-goblin-words-347 = tobacco
+accent-goblin-words-348 = took
+accent-goblin-words-349 = trick
+accent-goblin-words-350 = tricked
+accent-goblin-words-351 = tricky
+accent-goblin-words-352 = warden
+accent-goblin-words-353 = wardens
+accent-goblin-words-354 = watch
+accent-goblin-words-355 = watched
+accent-goblin-words-356 = watches
+accent-goblin-words-357 = watching
+accent-goblin-words-358 = water
+accent-goblin-words-359 = whether
+accent-goblin-words-360 = with
+accent-goblin-words-361 = without
+accent-goblin-words-362 = write
+accent-goblin-words-363 = writes
+accent-goblin-words-364 = writing
+accent-goblin-words-365 = written
+accent-goblin-words-366 = wrote
+
+accent-goblin-words-replace-1 = swag
+accent-goblin-words-replace-2 = jiggah
+accent-goblin-words-replace-3 = jiggahs
+accent-goblin-words-replace-4 = be
+accent-goblin-words-replace-5 = ain’t
+accent-goblin-words-replace-6 = wrinkle
+accent-goblin-words-replace-7 = cur
+accent-goblin-words-replace-8 = anyfin’
+accent-goblin-words-replace-9 = be
+accent-goblin-words-replace-10 = ain’t
+accent-goblin-words-replace-11 = ain’t
+accent-goblin-words-replace-12 = ain’t
+accent-goblin-words-replace-13 = snaffle
+accent-goblin-words-replace-14 = snaffled
+accent-goblin-words-replace-15 = snafflin’
+accent-goblin-words-replace-16 = snaffles
+accent-goblin-words-replace-17 = frummagemm
+accent-goblin-words-replace-18 = frummagemmed
+accent-goblin-words-replace-19 = frummagemmin'
+accent-goblin-words-replace-20 = frummagemms
+accent-goblin-words-replace-21 = poke
+accent-goblin-words-replace-22 = pokes
+accent-goblin-words-replace-23 = jiggah-dubbah
+accent-goblin-words-replace-24 = jiggah-dubbahs
+accent-goblin-words-replace-25 = slog
+accent-goblin-words-replace-26 = slogged
+accent-goblin-words-replace-27 = sloggin'
+accent-goblin-words-replace-28 = slogs
+accent-goblin-words-replace-29 = lush
+accent-goblin-words-replace-30 = grubbin’-ken
+accent-goblin-words-replace-31 = slour
+accent-goblin-words-replace-32 = sloured
+accent-goblin-words-replace-33 = stampah
+accent-goblin-words-replace-34 = stampahs
+accent-goblin-words-replace-35 = lush
+accent-goblin-words-replace-36 = 'um-drummed
+accent-goblin-words-replace-37 = 'um-drum
+accent-goblin-words-replace-38 = bo’le
+accent-goblin-words-replace-39 = bo’les
+accent-goblin-words-replace-40 = article
+accent-goblin-words-replace-41 = articles
+accent-goblin-words-replace-42 = quod
+accent-goblin-words-replace-43 = brovah
+accent-goblin-words-replace-44 = brovahs
+accent-goblin-words-replace-45 = fudge
+accent-goblin-words-replace-46 = fudgin’
+accent-goblin-words-replace-47 = ra’lah
+accent-goblin-words-replace-48 = bossman
+accent-goblin-words-replace-49 = bossmen
+accent-goblin-words-replace-50 = dimmocks
+accent-goblin-words-replace-51 = tufts
+accent-goblin-words-replace-52 = slop
+accent-goblin-words-replace-53 = rook
+accent-goblin-words-replace-54 = dub
+accent-goblin-words-replace-55 = dubbed
+accent-goblin-words-replace-56 = dubbin’
+accent-goblin-words-replace-57 = dunnage
+accent-goblin-words-replace-58 = lark
+accent-goblin-words-replace-59 = larks
+accent-goblin-words-replace-60 = tufts
+accent-goblin-words-replace-61 = croakah
+accent-goblin-words-replace-62 = laggah
+accent-goblin-words-replace-63 = jack tar
+accent-goblin-words-replace-64 = laggah
+accent-goblin-words-replace-65 = jack tars
+accent-goblin-words-replace-66 = job
+accent-goblin-words-replace-67 = jobs
+accent-goblin-words-replace-68 = jilt
+accent-goblin-words-replace-69 = jilts
+accent-goblin-words-replace-70 = bracelet
+accent-goblin-words-replace-71 = braceleted
+accent-goblin-words-replace-72 = bracele’in’
+accent-goblin-words-replace-73 = bracelets
+accent-goblin-words-replace-74 = chive
+accent-goblin-words-replace-75 = chives
+accent-goblin-words-replace-76 = chivin’
+accent-goblin-words-replace-77 = croakah
+accent-goblin-words-replace-78 = fence
+accent-goblin-words-replace-79 = fences
+accent-goblin-words-replace-80 = coopah
+accent-goblin-words-replace-81 = coopah'd
+accent-goblin-words-replace-82 = coopin’
+accent-goblin-words-replace-83 = grubbin’-ken
+accent-goblin-words-replace-84 = jiggah
+accent-goblin-words-replace-85 = jiggahs
+accent-goblin-words-replace-86 = crocus
+accent-goblin-words-replace-87 = jiggah
+accent-goblin-words-replace-88 = jiggahs
+accent-goblin-words-replace-89 = bub
+accent-goblin-words-replace-90 = bubbin’
+accent-goblin-words-replace-91 = bubs
+accent-goblin-words-replace-92 = trap
+accent-goblin-words-replace-93 = trap
+accent-goblin-words-replace-94 = stunty
+accent-goblin-words-replace-95 = stunties
+accent-goblin-words-replace-96 = emi’ah
+accent-goblin-words-replace-97 = everyfin’
+accent-goblin-words-replace-98 = baked
+accent-goblin-words-replace-99 = dashin'
+accent-goblin-words-replace-100 = favah
+accent-goblin-words-replace-101 = favahs
+accent-goblin-words-replace-102 = drags
+accent-goblin-words-replace-103 = drag
+accent-goblin-words-replace-104 = draggin’
+accent-goblin-words-replace-105 = dog
+accent-goblin-words-replace-106 = dogged
+accent-goblin-words-replace-107 = doggin’
+accent-goblin-words-replace-108 = dogs
+accent-goblin-words-replace-109 = grub
+accent-goblin-words-replace-110 = grubbin’-ken
+accent-goblin-words-replace-111 = grubbin’-ken
+accent-goblin-words-replace-112 = grubbin’-ken
+accent-goblin-words-replace-113 = grubbin’-ken
+accent-goblin-words-replace-114 = grubbin’-ken
+accent-goblin-words-replace-115 = grubbin’-ken
+accent-goblin-words-replace-116 = cake
+accent-goblin-words-replace-117 = cranky
+accent-goblin-words-replace-118 = soccer
+accent-goblin-words-replace-119 = fuckin’
+accent-goblin-words-replace-120 = bunged
+accent-goblin-words-replace-121 = bung
+accent-goblin-words-replace-122 = bungs
+accent-goblin-words-replace-123 = bungin’
+accent-goblin-words-replace-124 = goin' to
+accent-goblin-words-replace-125 = goin' to
+accent-goblin-words-replace-126 = li’le snack
+accent-goblin-words-replace-127 = 'amper
+accent-goblin-words-replace-128 = li’le snack
+accent-goblin-words-replace-129 = li’le snack
+accent-goblin-words-replace-130 = li’le snack
+accent-goblin-words-replace-131 = 'and
+accent-goblin-words-replace-132 = darbies
+accent-goblin-words-replace-133 = 'arass
+accent-goblin-words-replace-134 = 'arasses
+accent-goblin-words-replace-135 = 'arassin’
+accent-goblin-words-replace-136 = 'arassment
+accent-goblin-words-replace-137 = 'arbour
+accent-goblin-words-replace-138 = 'ard
+accent-goblin-words-replace-139 = 'as
+accent-goblin-words-replace-140 = 'as not
+accent-goblin-words-replace-141 = ain’t
+accent-goblin-words-replace-142 = ain’t
+accent-goblin-words-replace-143 = 'ave
+accent-goblin-words-replace-144 = 'ave not
+accent-goblin-words-replace-145 = ain’t
+accent-goblin-words-replace-146 = ain’t
+accent-goblin-words-replace-147 = 'e
+accent-goblin-words-replace-148 = 'ead
+accent-goblin-words-replace-149 = 'eal
+accent-goblin-words-replace-150 = 'ealin’
+accent-goblin-words-replace-151 = 'ear
+accent-goblin-words-replace-152 = 'eard
+accent-goblin-words-replace-153 = 'earin’
+accent-goblin-words-replace-154 = 'ears
+accent-goblin-words-replace-155 = 'eat
+accent-goblin-words-replace-156 = 'eaven
+accent-goblin-words-replace-157 = 'elix
+accent-goblin-words-replace-158 = 'ell
+accent-goblin-words-replace-159 = 'ellish
+accent-goblin-words-replace-160 = 'ello
+accent-goblin-words-replace-161 = 'elmet
+accent-goblin-words-replace-162 = 'er
+accent-goblin-words-replace-163 = 'eresy
+accent-goblin-words-replace-164 = 'eretical
+accent-goblin-words-replace-165 = 'ers
+accent-goblin-words-replace-166 = 'erseuf
+accent-goblin-words-replace-167 = oi
+accent-goblin-words-replace-168 = oi
+accent-goblin-words-replace-169 = 'ide
+accent-goblin-words-replace-170 = 'ideous
+accent-goblin-words-replace-171 = 'igh
+accent-goblin-words-replace-172 = 'ighly
+accent-goblin-words-replace-173 = 'im
+accent-goblin-words-replace-174 = 'imseuf
+accent-goblin-words-replace-175 = 'int
+accent-goblin-words-replace-176 = 'intin’
+accent-goblin-words-replace-177 = 'ints
+accent-goblin-words-replace-178 = 'ire
+accent-goblin-words-replace-179 = 'ired
+accent-goblin-words-replace-180 = 'ires
+accent-goblin-words-replace-181 = 'irin’
+accent-goblin-words-replace-182 = 'is
+accent-goblin-words-replace-183 = 'iss
+accent-goblin-words-replace-184 = 'it
+accent-goblin-words-replace-185 = 'old
+accent-goblin-words-replace-186 = 'oldin’
+accent-goblin-words-replace-187 = 'olly
+accent-goblin-words-replace-188 = 'onour
+accent-goblin-words-replace-189 = 'ope
+accent-goblin-words-replace-190 = 'orizon
+accent-goblin-words-replace-191 = 'orror
+accent-goblin-words-replace-192 = 'orrors
+accent-goblin-words-replace-193 = 'ose
+accent-goblin-words-replace-194 = 'ospital
+accent-goblin-words-replace-195 = 'ospitaller
+accent-goblin-words-replace-196 = 'ot
+accent-goblin-words-replace-197 = 'ot'ead
+accent-goblin-words-replace-198 = 'ot'eaded
+accent-goblin-words-replace-199 = 'otshot
+accent-goblin-words-replace-200 = 'aw
+accent-goblin-words-replace-201 = 'owever
+accent-goblin-words-replace-202 = 'uman
+accent-goblin-words-replace-203 = 'umans
+accent-goblin-words-replace-204 = 'url
+accent-goblin-words-replace-205 = 'urt
+accent-goblin-words-replace-206 = 'urtin’
+accent-goblin-words-replace-207 = 'ush
+accent-goblin-words-replace-208 = wrinkles
+accent-goblin-words-replace-209 = natural
+accent-goblin-words-replace-210 = wide awake
+accent-goblin-words-replace-211 = in for it
+accent-goblin-words-replace-212 = half baked
+accent-goblin-words-replace-213 = be
+accent-goblin-words-replace-214 = ain’t
+accent-goblin-words-replace-215 = ain’t
+accent-goblin-words-replace-216 = ain’t
+accent-goblin-words-replace-217 = jiggah-dubbah
+accent-goblin-words-replace-218 = jiggah-dubbahs
+accent-goblin-words-replace-219 = skit
+accent-goblin-words-replace-220 = skit
+accent-goblin-words-replace-221 = skits
+accent-goblin-words-replace-222 = skits
+accent-goblin-words-replace-223 = burke
+accent-goblin-words-replace-224 = burked
+accent-goblin-words-replace-225 = burkin’
+accent-goblin-words-replace-226 = burks
+accent-goblin-words-replace-227 = savey
+accent-goblin-words-replace-228 = savey
+accent-goblin-words-replace-229 = wide awake
+accent-goblin-words-replace-230 = stampe
+accent-goblin-words-replace-231 = stampes
+accent-goblin-words-replace-232 = let me
+accent-goblin-words-replace-233 = flam
+accent-goblin-words-replace-234 = flamed
+accent-goblin-words-replace-235 = flams
+accent-goblin-words-replace-236 = li’le
+accent-goblin-words-replace-237 = ogle
+accent-goblin-words-replace-238 = ogled
+accent-goblin-words-replace-239 = oglin’
+accent-goblin-words-replace-240 = ogles
+accent-goblin-words-replace-241 = flamin’
+accent-goblin-words-replace-242 = article
+accent-goblin-words-replace-243 = grubbin’-ken
+accent-goblin-words-replace-244 = prog
+accent-goblin-words-replace-245 = crocus
+accent-goblin-words-replace-246 = articles
+accent-goblin-words-replace-247 = blade
+accent-goblin-words-replace-248 = blades
+accent-goblin-words-replace-249 = blade
+accent-goblin-words-replace-250 = blades
+accent-goblin-words-replace-251 = dimmocks
+accent-goblin-words-replace-252 = movah
+accent-goblin-words-replace-253 = movahs
+accent-goblin-words-replace-254 = gob
+accent-goblin-words-replace-255 = movin’
+accent-goblin-words-replace-256 = burke
+accent-goblin-words-replace-257 = burked
+accent-goblin-words-replace-258 = burkin’
+accent-goblin-words-replace-259 = meseuf
+accent-goblin-words-replace-260 = dimbah
+accent-goblin-words-replace-261 = dimbah
+accent-goblin-words-replace-262 = coppahs
+accent-goblin-words-replace-263 = rootah
+accent-goblin-words-replace-264 = fudge
+accent-goblin-words-replace-265 = fudge
+accent-goblin-words-replace-266 = fudge
+accent-goblin-words-replace-267 = coppahs
+accent-goblin-words-replace-268 = coppah
+accent-goblin-words-replace-269 = linendraper
+accent-goblin-words-replace-270 = linendrapers
+accent-goblin-words-replace-271 = bit
+accent-goblin-words-replace-272 = bloke
+accent-goblin-words-replace-273 = jarvey
+accent-goblin-words-replace-274 = rampsman
+accent-goblin-words-replace-275 = rampsmen
+accent-goblin-words-replace-276 = quisby
+accent-goblin-words-replace-277 = lock-up
+accent-goblin-words-replace-278 = prowlah
+accent-goblin-words-replace-279 = winkin’
+accent-goblin-words-replace-280 = penny-a-liner
+accent-goblin-words-replace-281 = penny-a-liners
+accent-goblin-words-replace-282 = grubbin’-ken
+accent-goblin-words-replace-283 = flush
+accent-goblin-words-replace-284 = fylche
+accent-goblin-words-replace-285 = fylched
+accent-goblin-words-replace-286 = pike
+accent-goblin-words-replace-287 = staged
+accent-goblin-words-replace-288 = rumgumptious
+accent-goblin-words-replace-289 = gnostic
+accent-goblin-words-replace-290 = gnostics
+accent-goblin-words-replace-291 = coppah
+accent-goblin-words-replace-292 = beak
+accent-goblin-words-replace-293 = coppah
+accent-goblin-words-replace-294 = stags
+accent-goblin-words-replace-295 = staggin’
+accent-goblin-words-replace-296 = staged
+accent-goblin-words-replace-297 = dung
+accent-goblin-words-replace-298 = dungah
+accent-goblin-words-replace-299 = stampah
+accent-goblin-words-replace-300 = stampahs
+accent-goblin-words-replace-301 = avast
+accent-goblin-words-replace-302 = avast ya gob
+accent-goblin-words-replace-303 = shu’le
+accent-goblin-words-replace-304 = shu’les
+accent-goblin-words-replace-305 = doss
+accent-goblin-words-replace-306 = dossin’
+accent-goblin-words-replace-307 = ooze
+accent-goblin-words-replace-308 = oozes
+accent-goblin-words-replace-309 = dimbah-dambah
+accent-goblin-words-replace-310 = blow a cloud
+accent-goblin-words-replace-311 = blew a clowd
+accent-goblin-words-replace-312 = blows a cloud
+accent-goblin-words-replace-313 = blowin’ a cloud
+accent-goblin-words-replace-314 = football
+accent-goblin-words-replace-315 = somefin'
+accent-goblin-words-replace-316 = pa'ah
+accent-goblin-words-replace-317 = pa'ahin’
+accent-goblin-words-replace-318 = dimmocks
+accent-goblin-words-replace-319 = pa'ed
+accent-goblin-words-replace-320 = fylche
+accent-goblin-words-replace-321 = fylchin’
+accent-goblin-words-replace-322 = fylched
+accent-goblin-words-replace-323 = fylched
+accent-goblin-words-replace-324 = avast
+accent-goblin-words-replace-325 = duffah
+accent-goblin-words-replace-326 = lobster
+accent-goblin-words-replace-327 = lobster
+accent-goblin-words-replace-328 = lobsters
+accent-goblin-words-replace-329 = lobster
+accent-goblin-words-replace-330 = lobsters
+accent-goblin-words-replace-331 = lobsters
+accent-goblin-words-replace-332 = knap
+accent-goblin-words-replace-333 = knaps
+accent-goblin-words-replace-334 = knappin'
+accent-goblin-words-replace-335 = gab
+accent-goblin-words-replace-336 = gabbin'
+accent-goblin-words-replace-337 = gabs
+accent-goblin-words-replace-338 = templah
+accent-goblin-words-replace-339 = fylchin’
+accent-goblin-words-replace-340 = fylchah
+accent-goblin-words-replace-341 = fylchin’
+accent-goblin-words-replace-342 = fin’
+accent-goblin-words-replace-343 = fink
+accent-goblin-words-replace-344 = finkin’
+accent-goblin-words-replace-345 = fought
+accent-goblin-words-replace-346 = foughts
+accent-goblin-words-replace-347 = fogus
+accent-goblin-words-replace-348 = knapped
+accent-goblin-words-replace-349 = rig
+accent-goblin-words-replace-350 = rigged
+accent-goblin-words-replace-351 = riggy
+accent-goblin-words-replace-352 = jiggah-dubbah
+accent-goblin-words-replace-353 = jiggah-dubbahs
+accent-goblin-words-replace-354 = tout
+accent-goblin-words-replace-355 = touted
+accent-goblin-words-replace-356 = touts
+accent-goblin-words-replace-357 = toutin’
+accent-goblin-words-replace-358 = wo’ah
+accent-goblin-words-replace-359 = wever
+accent-goblin-words-replace-360 = wiv
+accent-goblin-words-replace-361 = wivout
+accent-goblin-words-replace-362 = screeve
+accent-goblin-words-replace-363 = screeves
+accent-goblin-words-replace-364 = screevin’
+accent-goblin-words-replace-365 = screeved
+accent-goblin-words-replace-366 = screeved
diff --git a/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl
new file mode 100644
index 00000000000..8c478c1c859
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl
@@ -0,0 +1,6 @@
+chat-speech-verb-name-goblin = Goblin
+chat-speech-verb-goblin-1 = jabbers
+chat-speech-verb-goblin-2 = vokers
+chat-speech-verb-goblin-3 = blurts out
+chat-speech-verb-goblin-4 = patters
+chat-speech-verb-goblin-5 = cuts
diff --git a/Resources/Locale/en-US/_NF/species/species.ftl b/Resources/Locale/en-US/_NF/species/species.ftl
new file mode 100644
index 00000000000..04677ee042f
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/species/species.ftl
@@ -0,0 +1 @@
+species-name-goblin = Goblin
diff --git a/Resources/Locale/en-US/_NF/traits/traits.ftl b/Resources/Locale/en-US/_NF/traits/traits.ftl
new file mode 100644
index 00000000000..b070e1fcf02
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/traits/traits.ftl
@@ -0,0 +1,2 @@
+trait-goblin-accent-name = Goblin Cant
+trait-goblin-accent-desc = You speak in secret language many find annoying and not that secretive.
diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
index 4fe3f9c36b4..fcc55dae386 100644
--- a/Resources/Locale/en-US/cargo/bounties.ftl
+++ b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -112,6 +112,27 @@ bounty-item-snakemeat = Snake meat
 bounty-item-snakeboots = Snakeskin boots
 bounty-item-xenomeat = Xeno meat
 bounty-item-egg-spider = Egg spider
+bounty-item-oxygen = Oxygen
+bounty-item-nitrogen = Nitrogen
+bounty-item-hydrogen = Hydrogen
+bounty-item-plasmagas = Plasma Gas
+bounty-item-chlorine = Chlorine
+bounty-item-fluorine = Fluorine
+bounty-item-tritium = Tritium
+bounty-item-frezon = Frezon
+bounty-item-methane = Methane
+bounty-item-chlorinetrifluoride = Chlorine trifluoride
+bounty-item-artifactglue = Artifact Glue
+bounty-item-weldingfuel = Welding Fuel
+bounty-item-acetone = Acetone
+bounty-item-arithrazine = Arithrazine
+bounty-item-epinephrine = Epinephrine
+bounty-item-unstablemutagen = Unstable Mutagen
+bounty-item-ammonia = Ammonia
+bounty-item-flour = Flour
+bounty-item-cocoapowder = Cocoa Powder
+bounty-item-frostoil = Frost Oil
+bounty-item-opporozidone = Opporozidone
 
 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.
diff --git a/Resources/Locale/en-US/construction/conditions/machine-frame-complete.ftl b/Resources/Locale/en-US/construction/conditions/machine-frame-complete.ftl
index e4903cc40ce..0ed732fa98e 100644
--- a/Resources/Locale/en-US/construction/conditions/machine-frame-complete.ftl
+++ b/Resources/Locale/en-US/construction/conditions/machine-frame-complete.ftl
@@ -1,4 +1,5 @@
 construction-condition-machine-container-empty = Remove the parts from the frame using a [color=cyan]Crowbar[/color].
+construction-condition-cryopod-container-empty = The cryopod must be empty to deconstruct. Wait for the person to exit.
 
 # MachineFrameComplete
 construction-condition-machine-frame-requirement-label = Requires:
diff --git a/Resources/Locale/en-US/datasets/names/goblin_female.ftl b/Resources/Locale/en-US/datasets/names/goblin_female.ftl
new file mode 100644
index 00000000000..e6e1b137199
--- /dev/null
+++ b/Resources/Locale/en-US/datasets/names/goblin_female.ftl
@@ -0,0 +1,208 @@
+names-goblin-female-dataset-1 = Milm
+names-goblin-female-dataset-2 = Tulxe
+names-goblin-female-dataset-3 = Choisz
+names-goblin-female-dataset-4 = Sogs
+names-goblin-female-dataset-5 = Igsa
+names-goblin-female-dataset-6 = Phupaangai
+names-goblin-female-dataset-7 = Iemolk
+names-goblin-female-dataset-8 = Rahuxee
+names-goblin-female-dataset-9 = Sterzirtea
+names-goblin-female-dataset-10 = Liablule
+names-goblin-female-dataset-11 = Guirx
+names-goblin-female-dataset-12 = Sluigs
+names-goblin-female-dataset-13 = Qil
+names-goblin-female-dataset-14 = Prilx
+names-goblin-female-dataset-15 = Sroifs
+names-goblin-female-dataset-16 = Klelrusha
+names-goblin-female-dataset-17 = Phoshaxia
+names-goblin-female-dataset-18 = Stulzoix
+names-goblin-female-dataset-19 = Wrivuish
+names-goblin-female-dataset-20 = Fiorift
+names-goblin-female-dataset-21 = Vraft
+names-goblin-female-dataset-22 = Preafse
+names-goblin-female-dataset-23 = Pash
+names-goblin-female-dataset-24 = Swosx
+names-goblin-female-dataset-25 = Ilia
+names-goblin-female-dataset-26 = Otvold
+names-goblin-female-dataset-27 = Bheaneaszai
+names-goblin-female-dataset-28 = Ykift
+names-goblin-female-dataset-29 = Qugogsai
+names-goblin-female-dataset-30 = Kiafezz
+names-goblin-female-dataset-31 = Ben
+names-goblin-female-dataset-32 = Grynx
+names-goblin-female-dataset-33 = Chilea
+names-goblin-female-dataset-34 = Glink
+names-goblin-female-dataset-35 = Vriaf
+names-goblin-female-dataset-36 = Blirmynqai
+names-goblin-female-dataset-37 = Gnalzess
+names-goblin-female-dataset-38 = Hahzufz
+names-goblin-female-dataset-39 = Tumafz
+names-goblin-female-dataset-40 = Khopsiex
+names-goblin-female-dataset-41 = Ohx
+names-goblin-female-dataset-42 = Yhxee
+names-goblin-female-dataset-43 = Teefea
+names-goblin-female-dataset-44 = Vrolt
+names-goblin-female-dataset-45 = Eeq
+names-goblin-female-dataset-46 = Sinuzzee
+names-goblin-female-dataset-47 = Srohbesze
+names-goblin-female-dataset-48 = Crosazi
+names-goblin-female-dataset-49 = Flolgelda
+names-goblin-female-dataset-50 = Cheeskoisx
+names-goblin-female-dataset-51 = Gefz
+names-goblin-female-dataset-52 = Srehea
+names-goblin-female-dataset-53 = Phyx
+names-goblin-female-dataset-54 = Slift
+names-goblin-female-dataset-55 = Praq
+names-goblin-female-dataset-56 = Truigeanx
+names-goblin-female-dataset-57 = Riepienq
+names-goblin-female-dataset-58 = Cheasseeng
+names-goblin-female-dataset-59 = Prusdert
+names-goblin-female-dataset-60 = Roivlulka
+names-goblin-female-dataset-61 = Gnuix
+names-goblin-female-dataset-62 = Gnuz
+names-goblin-female-dataset-63 = Urx
+names-goblin-female-dataset-64 = Chufsia
+names-goblin-female-dataset-65 = Lulk
+names-goblin-female-dataset-66 = Vobdelk
+names-goblin-female-dataset-67 = Viosmoltai
+names-goblin-female-dataset-68 = Rategs
+names-goblin-female-dataset-69 = Prilralx
+names-goblin-female-dataset-70 = Ciebalt
+names-goblin-female-dataset-71 = Miesz
+names-goblin-female-dataset-72 = Raafs
+names-goblin-female-dataset-73 = Gnolt
+names-goblin-female-dataset-74 = Shoildai
+names-goblin-female-dataset-75 = Pieprean
+names-goblin-female-dataset-76 = Aaftinxea
+names-goblin-female-dataset-77 = Wrabaalk
+names-goblin-female-dataset-78 = Wrioshaas
+names-goblin-female-dataset-79 = Shopfeelde
+names-goblin-female-dataset-80 = Fanx
+names-goblin-female-dataset-81 = Lath
+names-goblin-female-dataset-82 = Cult
+names-goblin-female-dataset-83 = Prugs
+names-goblin-female-dataset-84 = Crolma
+names-goblin-female-dataset-85 = Mokzux
+names-goblin-female-dataset-86 = Threekkozza
+names-goblin-female-dataset-87 = Cloirsart
+names-goblin-female-dataset-88 = Cegzexai
+names-goblin-female-dataset-89 = Wreetzold
+names-goblin-female-dataset-90 = Luns
+names-goblin-female-dataset-91 = Mengee
+names-goblin-female-dataset-92 = Glesxa
+names-goblin-female-dataset-93 = Fliolm
+names-goblin-female-dataset-94 = Jalk
+names-goblin-female-dataset-95 = Blohkuszee
+names-goblin-female-dataset-96 = Sletef
+names-goblin-female-dataset-97 = Vornelt
+names-goblin-female-dataset-98 = Gnaklixea
+names-goblin-female-dataset-99 = Ielild
+names-goblin-female-dataset-100 = Panx
+names-goblin-female-dataset-101 = Thele
+names-goblin-female-dataset-102 = Swylk
+names-goblin-female-dataset-103 = Olx
+names-goblin-female-dataset-104 = Sruimiangea
+names-goblin-female-dataset-105 = Blaagzilk
+names-goblin-female-dataset-106 = Gluilalt
+names-goblin-female-dataset-107 = Nahdathai
+names-goblin-female-dataset-108 = Ybniefsai
+names-goblin-female-dataset-109 = Thresea
+names-goblin-female-dataset-110 = Pialkai
+names-goblin-female-dataset-111 = Trold
+names-goblin-female-dataset-112 = Toisi
+names-goblin-female-dataset-113 = Chigia
+names-goblin-female-dataset-114 = Tigsinx
+names-goblin-female-dataset-115 = Ieveq
+names-goblin-female-dataset-116 = Wrersungea
+names-goblin-female-dataset-117 = Tiltang
+names-goblin-female-dataset-118 = Uhux
+names-goblin-female-dataset-119 = Gnofs
+names-goblin-female-dataset-120 = Grigs
+names-goblin-female-dataset-121 = Fruiq
+names-goblin-female-dataset-122 = Qofz
+names-goblin-female-dataset-123 = Healxea
+names-goblin-female-dataset-124 = Uimtuhx
+names-goblin-female-dataset-125 = Fliebzols
+names-goblin-female-dataset-126 = Boiplufta
+names-goblin-female-dataset-127 = Veruni
+names-goblin-female-dataset-128 = Vrumuingi
+names-goblin-female-dataset-129 = Trig
+names-goblin-female-dataset-130 = Swolm
+names-goblin-female-dataset-131 = Braas
+names-goblin-female-dataset-132 = Oshea
+names-goblin-female-dataset-133 = Throinq
+names-goblin-female-dataset-134 = Okin
+names-goblin-female-dataset-135 = Cleruzee
+names-goblin-female-dataset-136 = Pynoif
+names-goblin-female-dataset-137 = Fentash
+names-goblin-female-dataset-138 = Desriesh
+names-goblin-female-dataset-139 = Sags
+names-goblin-female-dataset-140 = Kluzea
+names-goblin-female-dataset-141 = Ig
+names-goblin-female-dataset-142 = Brolk
+names-goblin-female-dataset-143 = Conga
+names-goblin-female-dataset-144 = Phioflesx
+names-goblin-female-dataset-145 = Thrumziss
+names-goblin-female-dataset-146 = Vrubloildea
+names-goblin-female-dataset-147 = Ophafz
+names-goblin-female-dataset-148 = Srisburtee
+names-goblin-female-dataset-149 = Chig
+names-goblin-female-dataset-150 = Grurxi
+names-goblin-female-dataset-151 = Frinkea
+names-goblin-female-dataset-152 = Gnanx
+names-goblin-female-dataset-153 = Flols
+names-goblin-female-dataset-154 = Klovleerx
+names-goblin-female-dataset-155 = Chebdielt
+names-goblin-female-dataset-156 = Bliokness
+names-goblin-female-dataset-157 = Bloigkiart
+names-goblin-female-dataset-158 = Swegsoq
+names-goblin-female-dataset-159 = Pragsee
+names-goblin-female-dataset-160 = Shien
+names-goblin-female-dataset-161 = Soinq
+names-goblin-female-dataset-162 = Shielt
+names-goblin-female-dataset-163 = Fesi
+names-goblin-female-dataset-164 = Gnermol
+names-goblin-female-dataset-165 = Qiergufzai
+names-goblin-female-dataset-166 = Khopsiaz
+names-goblin-female-dataset-167 = Ovafsee
+names-goblin-female-dataset-168 = Stegziaft
+names-goblin-female-dataset-169 = Elt
+names-goblin-female-dataset-170 = Blerti
+names-goblin-female-dataset-171 = Dals
+names-goblin-female-dataset-172 = Sliqa
+names-goblin-female-dataset-173 = Paashia
+names-goblin-female-dataset-174 = Ipug
+names-goblin-female-dataset-175 = Mafnifa
+names-goblin-female-dataset-176 = Flaatrush
+names-goblin-female-dataset-177 = Saageqia
+names-goblin-female-dataset-178 = Clumosx
+names-goblin-female-dataset-179 = Cierxia
+names-goblin-female-dataset-180 = Resx
+names-goblin-female-dataset-181 = Phuift
+names-goblin-female-dataset-182 = Vreh
+names-goblin-female-dataset-183 = Frogs
+names-goblin-female-dataset-184 = Gnulbiosx
+names-goblin-female-dataset-185 = Hiemis
+names-goblin-female-dataset-186 = Erraha
+names-goblin-female-dataset-187 = Breavol
+names-goblin-female-dataset-188 = Caakvong
+names-goblin-female-dataset-189 = Prel
+names-goblin-female-dataset-190 = Kleefai
+names-goblin-female-dataset-191 = Eafz
+names-goblin-female-dataset-192 = Eeshi
+names-goblin-female-dataset-193 = Jysx
+names-goblin-female-dataset-194 = Thosseagsia
+names-goblin-female-dataset-195 = Uihboif
+names-goblin-female-dataset-196 = Uibiesz
+names-goblin-female-dataset-197 = Gryplilai
+names-goblin-female-dataset-198 = Clietnon
+names-goblin-female-dataset-199 = Glesx
+names-goblin-female-dataset-200 = Moft
+names-goblin-female-dataset-201 = Gnerte
+names-goblin-female-dataset-202 = Riex
+names-goblin-female-dataset-203 = Eng
+names-goblin-female-dataset-204 = Irraaxai
+names-goblin-female-dataset-205 = Chasizia
+names-goblin-female-dataset-206 = Siogensia
+names-goblin-female-dataset-207 = Thraarliotha
+names-goblin-female-dataset-208 = Weagkeenkea
diff --git a/Resources/Locale/en-US/datasets/names/goblin_last.ftl b/Resources/Locale/en-US/datasets/names/goblin_last.ftl
new file mode 100644
index 00000000000..b0dd53c67b9
--- /dev/null
+++ b/Resources/Locale/en-US/datasets/names/goblin_last.ftl
@@ -0,0 +1,210 @@
+names-goblin-last-dataset-1 = Cutsnap
+names-goblin-last-dataset-2 = Deadshift
+names-goblin-last-dataset-3 = Smartrocket
+names-goblin-last-dataset-4 = Peddlebeam
+names-goblin-last-dataset-5 = Fiztwist
+names-goblin-last-dataset-6 = Shiftcharge
+names-goblin-last-dataset-7 = Craftsteam
+names-goblin-last-dataset-8 = Vividgleam
+names-goblin-last-dataset-9 = Boltscrew
+names-goblin-last-dataset-10 = Cheaprocket
+names-goblin-last-dataset-11 = Sandcord
+names-goblin-last-dataset-12 = Grimesnap
+names-goblin-last-dataset-13 = Greedbulb
+names-goblin-last-dataset-14 = Fizztale
+names-goblin-last-dataset-15 = Silverbulb
+names-goblin-last-dataset-16 = Steamhead
+names-goblin-last-dataset-17 = Brokenbead
+names-goblin-last-dataset-18 = Madgob
+names-goblin-last-dataset-19 = Ficklegrubber
+names-goblin-last-dataset-20 = Loosefluke
+names-goblin-last-dataset-21 = Greasyblade
+names-goblin-last-dataset-22 = Shadowcoat
+names-goblin-last-dataset-23 = Fastboot
+names-goblin-last-dataset-24 = Fizztongue
+names-goblin-last-dataset-25 = Brisksprocket
+names-goblin-last-dataset-26 = Smartbite
+names-goblin-last-dataset-27 = Shiftfire
+names-goblin-last-dataset-28 = Fartweak
+names-goblin-last-dataset-29 = Grimeslice
+names-goblin-last-dataset-30 = Lazyvolt
+names-goblin-last-dataset-31 = Shortdirt
+names-goblin-last-dataset-32 = Slickwick
+names-goblin-last-dataset-33 = Cutgrubber
+names-goblin-last-dataset-34 = Meanskimmer
+names-goblin-last-dataset-35 = Blandchart
+names-goblin-last-dataset-36 = Bentflame
+names-goblin-last-dataset-37 = Powerbucket
+names-goblin-last-dataset-38 = Fusetweak
+names-goblin-last-dataset-39 = Rocketbeam
+names-goblin-last-dataset-40 = Shrillhead
+names-goblin-last-dataset-41 = Silvercheek
+names-goblin-last-dataset-42 = Madsnap
+names-goblin-last-dataset-43 = Botnozzle
+names-goblin-last-dataset-44 = Agilescrew
+names-goblin-last-dataset-45 = Boltflame
+names-goblin-last-dataset-46 = Plainbuttons
+names-goblin-last-dataset-47 = Niftgrubber
+names-goblin-last-dataset-48 = Mantongue
+names-goblin-last-dataset-49 = Rocketbeast
+names-goblin-last-dataset-50 = Smugbite
+names-goblin-last-dataset-51 = Manbite
+names-goblin-last-dataset-52 = Groundbit
+names-goblin-last-dataset-53 = Niftscrew
+names-goblin-last-dataset-54 = Starkbomb
+names-goblin-last-dataset-55 = Vexboot
+names-goblin-last-dataset-56 = Saltsteam
+names-goblin-last-dataset-57 = Toppocket
+names-goblin-last-dataset-58 = Pickblast
+names-goblin-last-dataset-59 = Looseclamp
+names-goblin-last-dataset-60 = Plainbutton
+names-goblin-last-dataset-61 = Multiwick
+names-goblin-last-dataset-62 = Slysnap
+names-goblin-last-dataset-63 = Slickgift
+names-goblin-last-dataset-64 = Rockettooth
+names-goblin-last-dataset-65 = Grimfault
+names-goblin-last-dataset-66 = Falseclamp
+names-goblin-last-dataset-67 = Leaftwist
+names-goblin-last-dataset-68 = Fizzlemine
+names-goblin-last-dataset-69 = Clearvolt
+names-goblin-last-dataset-70 = Keenshiv
+names-goblin-last-dataset-71 = Wildwick
+names-goblin-last-dataset-72 = Mancoil
+names-goblin-last-dataset-73 = Shiftrocket
+names-goblin-last-dataset-74 = Boltwatts
+names-goblin-last-dataset-75 = Shrillchart
+names-goblin-last-dataset-76 = Glumpocket
+names-goblin-last-dataset-77 = Meanhallow
+names-goblin-last-dataset-78 = Vexspark
+names-goblin-last-dataset-79 = Pickbub
+names-goblin-last-dataset-80 = Slyflame
+names-goblin-last-dataset-81 = Wrenchburst
+names-goblin-last-dataset-82 = Dullbit
+names-goblin-last-dataset-83 = Powertask
+names-goblin-last-dataset-84 = Fizbeast
+names-goblin-last-dataset-85 = Keentale
+names-goblin-last-dataset-86 = Dampslice
+names-goblin-last-dataset-87 = Greasymask
+names-goblin-last-dataset-88 = Blindbrake
+names-goblin-last-dataset-89 = Vexnose
+names-goblin-last-dataset-90 = Boltblast
+names-goblin-last-dataset-91 = Mudgleam
+names-goblin-last-dataset-92 = Lazyfuel
+names-goblin-last-dataset-93 = Goldpot
+names-goblin-last-dataset-94 = Roughgift
+names-goblin-last-dataset-95 = Gigashatter
+names-goblin-last-dataset-96 = Peppergleam
+names-goblin-last-dataset-97 = Steamshift
+names-goblin-last-dataset-98 = Kneebutton
+names-goblin-last-dataset-99 = Shadowpot
+names-goblin-last-dataset-100 = Deadtweak
+names-goblin-last-dataset-101 = Fiercewell
+names-goblin-last-dataset-102 = Peppergrin
+names-goblin-last-dataset-103 = Rashtask
+names-goblin-last-dataset-104 = Meanfang
+names-goblin-last-dataset-105 = Brokencharge
+names-goblin-last-dataset-106 = Farjolt
+names-goblin-last-dataset-107 = Greedmine
+names-goblin-last-dataset-108 = Rustmask
+names-goblin-last-dataset-109 = Moneybelt
+names-goblin-last-dataset-110 = Fastsnipe
+names-goblin-last-dataset-111 = Strongnozzle
+names-goblin-last-dataset-112 = Cogcrook
+names-goblin-last-dataset-113 = Fizzlebeast
+names-goblin-last-dataset-114 = Multihead
+names-goblin-last-dataset-115 = Multitwister
+names-goblin-last-dataset-116 = Loosedrive
+names-goblin-last-dataset-117 = Cheapflare
+names-goblin-last-dataset-118 = Clearbucket
+names-goblin-last-dataset-119 = Hagglewizzle
+names-goblin-last-dataset-120 = Sparksmile
+names-goblin-last-dataset-121 = Slytongue
+names-goblin-last-dataset-122 = Lazyblade
+names-goblin-last-dataset-123 = Multigear
+names-goblin-last-dataset-124 = Kneeclamp
+names-goblin-last-dataset-125 = Grapplerocket
+names-goblin-last-dataset-126 = Falsefuel
+names-goblin-last-dataset-127 = Fastnose
+names-goblin-last-dataset-128 = Smallflame
+names-goblin-last-dataset-129 = Falsegrubber
+names-goblin-last-dataset-130 = Faintdoc
+names-goblin-last-dataset-131 = Hardwrench
+names-goblin-last-dataset-132 = Saltcord
+names-goblin-last-dataset-133 = Greaseflow
+names-goblin-last-dataset-134 = Blindbeam
+names-goblin-last-dataset-135 = Vividhammer
+names-goblin-last-dataset-136 = Meanhold
+names-goblin-last-dataset-137 = Sandgrinder
+names-goblin-last-dataset-138 = Smallbasher
+names-goblin-last-dataset-139 = Moneyhammer
+names-goblin-last-dataset-140 = Madknob
+names-goblin-last-dataset-141 = Grapplecharge
+names-goblin-last-dataset-142 = Silvergob
+names-goblin-last-dataset-143 = Cogbite
+names-goblin-last-dataset-144 = Botfuse
+names-goblin-last-dataset-145 = Glumhammer
+names-goblin-last-dataset-146 = Rashhead
+names-goblin-last-dataset-147 = Sandhire
+names-goblin-last-dataset-148 = Glumtongue
+names-goblin-last-dataset-149 = Agilebit
+names-goblin-last-dataset-150 = Blandbit
+names-goblin-last-dataset-151 = Glumpatch
+names-goblin-last-dataset-152 = Vividbelt
+names-goblin-last-dataset-153 = Fizzbottom
+names-goblin-last-dataset-154 = Cheapfeet
+names-goblin-last-dataset-155 = Agilejolt
+names-goblin-last-dataset-156 = Slickwrench
+names-goblin-last-dataset-157 = Topwell
+names-goblin-last-dataset-158 = Sharpdrive
+names-goblin-last-dataset-159 = Slickfingers
+names-goblin-last-dataset-160 = Greasyfang
+names-goblin-last-dataset-161 = Glumspark
+names-goblin-last-dataset-162 = Cutpinch
+names-goblin-last-dataset-163 = Hardsnipe
+names-goblin-last-dataset-164 = Sandmask
+names-goblin-last-dataset-165 = Hagglebolt
+names-goblin-last-dataset-166 = Wrenchdrive
+names-goblin-last-dataset-167 = Greasykettle
+names-goblin-last-dataset-168 = Silverbolt
+names-goblin-last-dataset-169 = Falsepost
+names-goblin-last-dataset-170 = Falseblaster
+names-goblin-last-dataset-171 = Rustbelt
+names-goblin-last-dataset-172 = Starkburst
+names-goblin-last-dataset-173 = Cheapcharge
+names-goblin-last-dataset-174 = Leafbite
+names-goblin-last-dataset-175 = Hardracket
+names-goblin-last-dataset-176 = Hardclamp
+names-goblin-last-dataset-177 = Fasthold
+names-goblin-last-dataset-178 = Grandblade
+names-goblin-last-dataset-179 = Aridracket
+names-goblin-last-dataset-180 = Multibuttons
+names-goblin-last-dataset-181 = Grimeblade
+names-goblin-last-dataset-182 = Fixbombs
+names-goblin-last-dataset-183 = Fizzlechin
+names-goblin-last-dataset-184 = Meanclamp
+names-goblin-last-dataset-185 = Bentblaster
+names-goblin-last-dataset-186 = Boomhammer
+names-goblin-last-dataset-187 = Hardbuttons
+names-goblin-last-dataset-188 = Megacoil
+names-goblin-last-dataset-189 = Shadownose
+names-goblin-last-dataset-190 = Brokenbomb
+names-goblin-last-dataset-191 = Smartskimmer
+names-goblin-last-dataset-192 = Ficklegrin
+names-goblin-last-dataset-193 = Blinddirt
+names-goblin-last-dataset-194 = Fusepot
+names-goblin-last-dataset-195 = Topbucket
+names-goblin-last-dataset-196 = Rustbomb
+names-goblin-last-dataset-197 = Grimepocket
+names-goblin-last-dataset-198 = Cheaptweak
+names-goblin-last-dataset-199 = Shrillshiv
+names-goblin-last-dataset-200 = Smugpinch
+names-goblin-last-dataset-201 = Grimblade
+names-goblin-last-dataset-202 = Keentongue
+names-goblin-last-dataset-203 = Sandpot
+names-goblin-last-dataset-204 = Meanhook
+names-goblin-last-dataset-205 = Sandgrubber
+names-goblin-last-dataset-206 = Saltblast
+names-goblin-last-dataset-207 = Slyfire
+names-goblin-last-dataset-208 = Foamscrew
+names-goblin-last-dataset-209 = Fizzlebub
+names-goblin-last-dataset-210 = Hardfault
diff --git a/Resources/Locale/en-US/datasets/names/goblin_male.ftl b/Resources/Locale/en-US/datasets/names/goblin_male.ftl
new file mode 100644
index 00000000000..94517279e2f
--- /dev/null
+++ b/Resources/Locale/en-US/datasets/names/goblin_male.ftl
@@ -0,0 +1,209 @@
+names-goblin-male-dataset-1 = Crirt
+names-goblin-male-dataset-2 = Weq
+names-goblin-male-dataset-3 = Blaq
+names-goblin-male-dataset-4 = Xork
+names-goblin-male-dataset-5 = Jestuirm
+names-goblin-male-dataset-6 = Storuq
+names-goblin-male-dataset-7 = Eantard
+names-goblin-male-dataset-8 = Zratnirt
+names-goblin-male-dataset-9 = Granurd
+names-goblin-male-dataset-10 = Srekz
+names-goblin-male-dataset-11 = Srard
+names-goblin-male-dataset-12 = Drenk
+names-goblin-male-dataset-13 = Klaax
+names-goblin-male-dataset-14 = Strias
+names-goblin-male-dataset-15 = Glonyq
+names-goblin-male-dataset-16 = Tamteard
+names-goblin-male-dataset-17 = Stonieng
+names-goblin-male-dataset-18 = Camard
+names-goblin-male-dataset-19 = Drazdazz
+names-goblin-male-dataset-20 = Fex
+names-goblin-male-dataset-21 = Clonk
+names-goblin-male-dataset-22 = Wriord
+names-goblin-male-dataset-23 = Slac
+names-goblin-male-dataset-24 = Trekt
+names-goblin-male-dataset-25 = Vrulykt
+names-goblin-male-dataset-26 = Pasking
+names-goblin-male-dataset-27 = Crotrisz
+names-goblin-male-dataset-28 = Igrus
+names-goblin-male-dataset-29 = Udard
+names-goblin-male-dataset-30 = Ezz
+names-goblin-male-dataset-31 = Brerd
+names-goblin-male-dataset-32 = Toc
+names-goblin-male-dataset-33 = Weerm
+names-goblin-male-dataset-34 = Waabs
+names-goblin-male-dataset-35 = Srirbet
+names-goblin-male-dataset-36 = Zivnaar
+names-goblin-male-dataset-37 = Straabbeags
+names-goblin-male-dataset-38 = Otaarx
+names-goblin-male-dataset-39 = Xiotbeekz
+names-goblin-male-dataset-40 = Iolb
+names-goblin-male-dataset-41 = Tret
+names-goblin-male-dataset-42 = Eazz
+names-goblin-male-dataset-43 = Gnits
+names-goblin-male-dataset-44 = Slax
+names-goblin-male-dataset-45 = Clokakx
+names-goblin-male-dataset-46 = Ihbird
+names-goblin-male-dataset-47 = Stadsarx
+names-goblin-male-dataset-48 = Slezlylb
+names-goblin-male-dataset-49 = Wrultekx
+names-goblin-male-dataset-50 = Klior
+names-goblin-male-dataset-51 = Oilb
+names-goblin-male-dataset-52 = Rielk
+names-goblin-male-dataset-53 = Lakx
+names-goblin-male-dataset-54 = Plisb
+names-goblin-male-dataset-55 = Gneesits
+names-goblin-male-dataset-56 = Riskuc
+names-goblin-male-dataset-57 = Sredzerx
+names-goblin-male-dataset-58 = Brolsukx
+names-goblin-male-dataset-59 = Gleermiozz
+names-goblin-male-dataset-60 = Bald
+names-goblin-male-dataset-61 = Kralb
+names-goblin-male-dataset-62 = Gnizz
+names-goblin-male-dataset-63 = Jiec
+names-goblin-male-dataset-64 = Vuq
+names-goblin-male-dataset-65 = Zersoikt
+names-goblin-male-dataset-66 = Alerk
+names-goblin-male-dataset-67 = Klagat
+names-goblin-male-dataset-68 = Filteerd
+names-goblin-male-dataset-69 = Kriattialb
+names-goblin-male-dataset-70 = Rort
+names-goblin-male-dataset-71 = Striabs
+names-goblin-male-dataset-72 = Glild
+names-goblin-male-dataset-73 = Plieng
+names-goblin-male-dataset-74 = Zreazz
+names-goblin-male-dataset-75 = Irsucs
+names-goblin-male-dataset-76 = Easox
+names-goblin-male-dataset-77 = Bribsuird
+names-goblin-male-dataset-78 = Crizots
+names-goblin-male-dataset-79 = Oivoits
+names-goblin-male-dataset-80 = Bluits
+names-goblin-male-dataset-81 = Ceakx
+names-goblin-male-dataset-82 = Freank
+names-goblin-male-dataset-83 = Jebs
+names-goblin-male-dataset-84 = Kragz
+names-goblin-male-dataset-85 = Slahees
+names-goblin-male-dataset-86 = Ynzeets
+names-goblin-male-dataset-87 = Wiltik
+names-goblin-male-dataset-88 = Irzarm
+names-goblin-male-dataset-89 = Krieveq
+names-goblin-male-dataset-90 = Ord
+names-goblin-male-dataset-91 = Reect
+names-goblin-male-dataset-92 = Fas
+names-goblin-male-dataset-93 = Ploc
+names-goblin-male-dataset-94 = Glelk
+names-goblin-male-dataset-95 = Iabeasb
+names-goblin-male-dataset-96 = Ytmusb
+names-goblin-male-dataset-97 = Sliozlet
+names-goblin-male-dataset-98 = Oibaakz
+names-goblin-male-dataset-99 = Catbuit
+names-goblin-male-dataset-100 = Fuk
+names-goblin-male-dataset-101 = Bruikx
+names-goblin-male-dataset-102 = Slaq
+names-goblin-male-dataset-103 = Eec
+names-goblin-male-dataset-104 = Liold
+names-goblin-male-dataset-105 = Brodoit
+names-goblin-male-dataset-106 = Zuiggat
+names-goblin-male-dataset-107 = Kloreart
+names-goblin-male-dataset-108 = Huigmeld
+names-goblin-male-dataset-109 = Jumres
+names-goblin-male-dataset-110 = Eegs
+names-goblin-male-dataset-111 = Ig
+names-goblin-male-dataset-112 = Erd
+names-goblin-male-dataset-113 = Zeabs
+names-goblin-male-dataset-114 = Brekx
+names-goblin-male-dataset-115 = Eabeekx
+names-goblin-male-dataset-116 = Bibdaats
+names-goblin-male-dataset-117 = Greztaak
+names-goblin-male-dataset-118 = Kledoilk
+names-goblin-male-dataset-119 = Clidsuil
+names-goblin-male-dataset-120 = Drurd
+names-goblin-male-dataset-121 = Kuis
+names-goblin-male-dataset-122 = Trerx
+names-goblin-male-dataset-123 = Bulk
+names-goblin-male-dataset-124 = Voikz
+names-goblin-male-dataset-125 = Xogbiecs
+names-goblin-male-dataset-126 = Zriostriesz
+names-goblin-male-dataset-127 = Chysix
+names-goblin-male-dataset-128 = Srodreebs
+names-goblin-male-dataset-129 = Isoilx
+names-goblin-male-dataset-130 = Struilx
+names-goblin-male-dataset-131 = Ionk
+names-goblin-male-dataset-132 = Xuiq
+names-goblin-male-dataset-133 = Xukz
+names-goblin-male-dataset-134 = Klats
+names-goblin-male-dataset-135 = Trassabs
+names-goblin-male-dataset-136 = Cliarit
+names-goblin-male-dataset-137 = Plaareec
+names-goblin-male-dataset-138 = Sroitlaact
+names-goblin-male-dataset-139 = Zodnut
+names-goblin-male-dataset-140 = Klield
+names-goblin-male-dataset-141 = Brierx
+names-goblin-male-dataset-142 = Brix
+names-goblin-male-dataset-143 = Zard
+names-goblin-male-dataset-144 = Bylx
+names-goblin-male-dataset-145 = Strugder
+names-goblin-male-dataset-146 = Troviazz
+names-goblin-male-dataset-147 = Razgilb
+names-goblin-male-dataset-148 = Featzags
+names-goblin-male-dataset-149 = Creszord
+names-goblin-male-dataset-150 = Sraal
+names-goblin-male-dataset-151 = Srul
+names-goblin-male-dataset-152 = Purk
+names-goblin-male-dataset-153 = Zyts
+names-goblin-male-dataset-154 = Jeard
+names-goblin-male-dataset-155 = Cartazz
+names-goblin-male-dataset-156 = Igzikx
+names-goblin-male-dataset-157 = Tregmolx
+names-goblin-male-dataset-158 = Striegdikt
+names-goblin-male-dataset-159 = Golkiosz
+names-goblin-male-dataset-160 = Eel
+names-goblin-male-dataset-161 = Trarx
+names-goblin-male-dataset-162 = Pux
+names-goblin-male-dataset-163 = Ex
+names-goblin-male-dataset-164 = Grict
+names-goblin-male-dataset-165 = Ugbuis
+names-goblin-male-dataset-166 = Lusroic
+names-goblin-male-dataset-167 = Fotoigz
+names-goblin-male-dataset-168 = Costract
+names-goblin-male-dataset-169 = Trorzazz
+names-goblin-male-dataset-170 = Gnok
+names-goblin-male-dataset-171 = Kloirm
+names-goblin-male-dataset-172 = Gaart
+names-goblin-male-dataset-173 = Slugs
+names-goblin-male-dataset-174 = Plobs
+names-goblin-male-dataset-175 = Gnuglol
+names-goblin-male-dataset-176 = Wrulkolx
+names-goblin-male-dataset-177 = Branic
+names-goblin-male-dataset-178 = Chusekt
+names-goblin-male-dataset-179 = Plegmunk
+names-goblin-male-dataset-180 = Cyzz
+names-goblin-male-dataset-181 = Zrets
+names-goblin-male-dataset-182 = Ubs
+names-goblin-male-dataset-183 = Peaq
+names-goblin-male-dataset-184 = Cherx
+names-goblin-male-dataset-185 = Ugdurx
+names-goblin-male-dataset-186 = Traakark
+names-goblin-male-dataset-187 = Iehdoilx
+names-goblin-male-dataset-188 = Biaskeas
+names-goblin-male-dataset-189 = Zavzox
+names-goblin-male-dataset-190 = Plialb
+names-goblin-male-dataset-191 = Zaakt
+names-goblin-male-dataset-192 = Stard
+names-goblin-male-dataset-193 = Jaart
+names-goblin-male-dataset-194 = Struld
+names-goblin-male-dataset-195 = Sremakx
+names-goblin-male-dataset-196 = Uvyr
+names-goblin-male-dataset-197 = Xienriot
+names-goblin-male-dataset-198 = Gryvosz
+names-goblin-male-dataset-199 = Wedyr
+names-goblin-male-dataset-200 = Wroirk
+names-goblin-male-dataset-201 = Crigz
+names-goblin-male-dataset-202 = Sraas
+names-goblin-male-dataset-203 = Blox
+names-goblin-male-dataset-204 = Gelb
+names-goblin-male-dataset-205 = Gnolakz
+names-goblin-male-dataset-206 = Abnylb
+names-goblin-male-dataset-207 = Wruzekx
+names-goblin-male-dataset-208 = Liogaz
+names-goblin-male-dataset-209 = Vradseerd
diff --git a/Resources/Locale/en-US/markings/goblin_markings.ftl b/Resources/Locale/en-US/markings/goblin_markings.ftl
new file mode 100644
index 00000000000..3f5c96da32b
--- /dev/null
+++ b/Resources/Locale/en-US/markings/goblin_markings.ftl
@@ -0,0 +1,15 @@
+# goblin ears
+marking-GoblinEarsBasic = Basic Ears
+marking-GoblinEarsBasicAlt = Basic Ears (Alt)
+marking-GoblinEarsLong01 = Long Ears (tips down)
+marking-GoblinEarsLong02 = Long Ears (tips up)
+
+# goblin noses
+marking-GoblinNoseBasic = Basic Nose
+marking-GoblinNoseLong = Long Nose
+marking-GoblinNoseCrooked = Crooked Nose
+
+# goblin tusks
+marking-GoblinTusksBasic = No Tusks
+marking-GoblinTusksSmall = Small Tusks
+marking-GoblinTusksBig = Long Tusks
diff --git a/Resources/Locale/en-US/metabolism/metabolizer-types.ftl b/Resources/Locale/en-US/metabolism/metabolizer-types.ftl
index 372c5c549e0..70f165ac83a 100644
--- a/Resources/Locale/en-US/metabolism/metabolizer-types.ftl
+++ b/Resources/Locale/en-US/metabolism/metabolizer-types.ftl
@@ -9,3 +9,4 @@ metabolizer-type-plant = Plant
 metabolizer-type-dwarf = Dwarf
 metabolizer-type-moth = Moth
 metabolizer-type-arachnid = Arachnid
+metabolizer-type-goblin = Goblin
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 4f67fae1cd4..ec6dce80ac4 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -288,7 +288,7 @@ uplink-surplus-bundle-desc = Contains 50 telecrystals worth of completely random
 uplink-super-surplus-bundle-name = Super Surplus Crate
 uplink-super-surplus-bundle-desc = Contains 125 telecrystals worth of completely random Syndicate items.
 
-uplink-starter-kit-name = Basic Operative Bundle
+uplink-starter-kit-name = Operative Bundle
 uplink-starter-kit-desc = Contains 40 telecrystals of basic operative gear. For those operatives who just don't know what they should buy.
 
 # Tools
diff --git a/Resources/Prototypes/Body/Species/goblin.yml b/Resources/Prototypes/Body/Species/goblin.yml
new file mode 100644
index 00000000000..57c07e8aab1
--- /dev/null
+++ b/Resources/Prototypes/Body/Species/goblin.yml
@@ -0,0 +1,241 @@
+- type: markingsGroup
+  parent: Undergarments
+  id: Goblin
+  limits:
+    enum.HumanoidVisualLayers.Hair:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.FacialHair:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.Chest:
+      limit: 2
+      required: false
+    enum.HumanoidVisualLayers.Snout:
+      limit: 1
+      required: true
+      default: [ GoblinNoseBasic ]
+    enum.HumanoidVisualLayers.HeadTop:
+      limit: 1
+      required: true
+      default: [ GoblinEarsBasic ]
+    enum.HumanoidVisualLayers.HeadSide:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.LArm:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.RArm:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.LHand:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.RHand:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.LLeg:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.RLeg:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.LFoot:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.RFoot:
+      limit: 1
+      required: false
+
+- type: entity
+  parent: BaseSpeciesAppearance
+  id: AppearanceGoblin
+  name: goblin appearance
+  components:
+  - type: Inventory
+    templateId: human
+    speciesId: goblin
+  - type: InitialBody
+    organs:
+      Torso: OrganGoblinTorso
+      Head: OrganGoblinHead
+      ArmLeft: OrganGoblinArmLeft
+      ArmRight: OrganGoblinArmRight
+      HandRight: OrganGoblinHandRight
+      HandLeft: OrganGoblinHandLeft
+      LegLeft: OrganGoblinLegLeft
+      LegRight: OrganGoblinLegRight
+      FootLeft: OrganGoblinFootLeft
+      FootRight: OrganGoblinFootRight
+      Brain: OrganGoblinBrain
+      Eyes: OrganGoblinEyes
+      Tongue: OrganGoblinTongue
+      Appendix: OrganGoblinAppendix
+      Ears: OrganGoblinEars
+      Lungs: OrganGoblinLungs
+      Heart: OrganGoblinHeart
+      Stomach: OrganGoblinStomach
+      Liver: OrganGoblinLiver
+      Kidneys: OrganGoblinKidneys
+  - type: HumanoidProfile
+    species: Goblin
+  - type: ScaleVisuals
+    scale: 0.85, 0.8
+
+- type: entity
+  parent:
+  - AppearanceGoblin
+  - BaseSpeciesMobOrganic
+  id: MobGoblin
+  name: Urist McGoblin
+  components:
+  - type: Damageable
+    damageModifierSet: Goblin
+  - type: MeleeWeapon
+    soundHit:
+      collection: AlienClaw
+    angle: 30
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Slash: 3
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        # they r smaller
+        density: 120
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Vocal
+    sounds:
+      Male: MaleGoblin
+      Female: FemaleGoblin
+      Unsexed: MaleGoblin
+  - type: ReplacementAccent
+    accent: goblin_accent
+
+- type: entity
+  parent: OrganBase
+  id: OrganGoblin
+  abstract: true
+  suffix: Goblin
+
+- type: entity
+  id: OrganGoblinMetabolizer
+  abstract: true
+  components:
+  - type: Metabolizer
+    metabolizerTypes: [ Goblin ]
+
+- type: entity
+  parent: OrganGoblin
+  id: OrganGoblinInternal
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+
+- type: entity
+  id: OrganGoblinVisual
+  abstract: true
+  components:
+  - type: VisualOrgan
+    data:
+      sprite: _NF/Mobs/Species/Goblin/parts.rsi
+  - type: VisualOrganMarkings
+    markingData:
+      group: Goblin
+
+- type: entity
+  parent: [ OrganGoblin, OrganGoblinVisual ]
+  id: OrganGoblinExternal
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+
+- type: entity
+  parent: [ OrganBaseTorsoSexed, OrganBaseTorso, OrganGoblinExternal ]
+  id: OrganGoblinTorso
+
+- type: entity
+  parent: [ OrganBaseHeadSexed, OrganBaseHead, OrganGoblinExternal ]
+  id: OrganGoblinHead
+
+- type: entity
+  parent: [ OrganBaseArmLeft, OrganGoblinExternal ]
+  id: OrganGoblinArmLeft
+
+- type: entity
+  parent: [ OrganBaseArmRight, OrganGoblinExternal ]
+  id: OrganGoblinArmRight
+
+- type: entity
+  parent: [ OrganBaseHandLeft, OrganGoblinExternal ]
+  id: OrganGoblinHandLeft
+
+- type: entity
+  parent: [ OrganBaseHandRight, OrganGoblinExternal ]
+  id: OrganGoblinHandRight
+
+- type: entity
+  parent: [ OrganBaseLegLeft, OrganGoblinExternal ]
+  id: OrganGoblinLegLeft
+
+- type: entity
+  parent: [ OrganBaseLegRight, OrganGoblinExternal ]
+  id: OrganGoblinLegRight
+
+- type: entity
+  parent: [ OrganBaseFootLeft, OrganGoblinExternal ]
+  id: OrganGoblinFootLeft
+
+- type: entity
+  parent: [ OrganBaseFootRight, OrganGoblinExternal ]
+  id: OrganGoblinFootRight
+
+- type: entity
+  parent: [ OrganBaseBrain, OrganSpriteHumanInternal, OrganGoblinInternal ]
+  id: OrganGoblinBrain
+
+- type: entity
+  parent: [ OrganGoblinVisual, OrganBaseEyes, OrganGoblinInternal ]
+  id: OrganGoblinEyes
+
+- type: entity
+  parent: [ OrganBaseTongue, OrganGoblinInternal ]
+  id: OrganGoblinTongue
+
+- type: entity
+  parent: [ OrganBaseAppendix, OrganSpriteHumanInternal, OrganGoblinInternal ]
+  id: OrganGoblinAppendix
+
+- type: entity
+  parent: [ OrganBaseEars, OrganSpriteHumanInternal, OrganGoblinInternal ]
+  id: OrganGoblinEars
+
+- type: entity
+  parent: [ OrganBaseLungs, OrganGoblinInternal, OrganGoblinMetabolizer ]
+  id: OrganGoblinLungs
+
+- type: entity
+  parent: [ OrganBaseHeart, OrganGoblinInternal, OrganGoblinMetabolizer ]
+  id: OrganGoblinHeart
+
+- type: entity
+  parent: [ OrganBaseStomach, OrganGoblinInternal, OrganGoblinMetabolizer ]
+  id: OrganGoblinStomach
+
+- type: entity
+  parent: [ OrganBaseLiver, OrganSpriteHumanInternal, OrganGoblinInternal, OrganGoblinMetabolizer ]
+  id: OrganGoblinLiver
+
+- type: entity
+  parent: [ OrganBaseKidneys, OrganSpriteHumanInternal, OrganGoblinInternal, OrganGoblinMetabolizer ]
+  id: OrganGoblinKidneys
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 7d7adf478bc..37acaa1edd7 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -1,423 +1,3 @@
-- type: cargoBounty
-  id: BountyOxygen
-  reward: 0.55
-  description: bounty-description-artifact
-  gasId: Oxygen
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Oxygen
-    amount: 10000
-
-- type: cargoBounty
-  id: BountyNitrogen
-  reward: 0.5
-  description: bounty-description-artifact
-  gasId: Nitrogen
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Nitrogen
-    amount: 10000
-
-- type: cargoBounty
-  id: BountyHydrogen
-  reward: 0.75
-  description: bounty-description-artifact
-  gasId: Hydrogen
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Hydrogen
-    amount: 10000
-
-- type: cargoBounty
-  id: BountyPlasmaGas
-  reward: 0.75
-  description: bounty-description-artifact
-  gasId: Plasma
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Plasma
-    amount: 12500
-
-- type: cargoBounty
-  id: BountyChlorine
-  reward: 2.25
-  description: bounty-description-artifact
-  gasId: Chlorine
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Chlorine
-    amount: 2500
-
-- type: cargoBounty
-  id: BountyFluorine
-  reward: 2.5
-  description: bounty-description-artifact
-  gasId: Fluorine
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Fluorine
-    amount: 2500
-
-- type: cargoBounty
-  id: BountyTritium
-  reward: 5
-  description: bounty-description-artifact
-  gasId: Tritium
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Tritium
-    amount: 2000
-
-- type: cargoBounty
-  id: BountyFrezon
-  reward: 10
-  description: bounty-description-artifact
-  gasId: Frezon
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Frezon
-    amount: 1500
-
-- type: cargoBounty
-  id: BountyMethane
-  reward: 2.8
-  description: bounty-description-artifact
-  gasId: Methane
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: Methane
-    amount: 3000
-
-- type: cargoBounty
-  id: BountyChlorineTrifluoride
-  reward: 12.5
-  description: bounty-description-artifact
-  gasId: ChlorineTrifluoride
-  group: GasBounty
-  bountyType: PayPerGas
-  entries:
-  - name: ChlorineTrifluoride
-    amount: 1500
-
-- type: cargoBounty
-  id: BountyArtifactGlue
-  reward: 10
-  description: bounty-description-artifact
-  reagentId: ArtifactGlue
-  group: ReagentBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Artifact Glue
-    amount: 1000
-
-- type: cargoBounty
-  id: BountyWeldingFuel
-  reward: 2.5
-  description: bounty-description-artifact
-  reagentId: WeldingFuel
-  group: ReagentBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Welding Fuel
-    amount: 1000
-
-- type: cargoBounty
-  id: BountyAcetone
-  reward: 4
-  description: bounty-description-artifact
-  reagentId: Acetone
-  group: ReagentBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Acetone
-    amount: 1000
-
-- type: cargoBounty
-  id: BountyArithrazine
-  reward: 15
-  description: bounty-description-artifact
-  reagentId: Arithrazine
-  group: ReagentBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Arithrazine
-    amount: 100
-
-- type: cargoBounty
-  id: BountyEpinephrine
-  reward: 10
-  description: bounty-description-artifact
-  reagentId: Epinephrine
-  group: ReagentBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Epinephrine
-    amount: 200
-
-- type: cargoBounty
-  id: BountyUnstableMutagen
-  reward: 30
-  description: bounty-description-artifact
-  reagentId: UnstableMutagen
-  group: ServiceBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Unstable Mutagen
-    amount: 250
-
-- type: cargoBounty
-  id: BountyAmmonia
-  reward: 5
-  description: bounty-description-artifact
-  reagentId: Ammonia
-  group: ServiceBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Ammonia
-    amount: 500
-
-- type: cargoBounty
-  id: BountyFlour
-  reward: 5
-  description: bounty-description-artifact
-  reagentId: Flour
-  group: ServiceBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Flour
-    amount: 750
-
-- type: cargoBounty
-  id: BountyCocoaPowder
-  reward: 7.5
-  description: bounty-description-artifact
-  reagentId: CocoaPowder
-  group: ServiceBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Cocoa Powder
-    amount: 600
-
-- type: cargoBounty
-  id: BountyFrostOil
-  reward: 10
-  description: bounty-description-artifact
-  reagentId: FrostOil
-  group: ServiceBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Frost Oil
-    amount: 500
-
-- type: cargoBounty
-  id: BountyOpporozidone
-  reward: 50
-  description: bounty-description-artifact
-  reagentId: Opporozidone
-  group: StationBounty
-  bountyType: PayPerReagent
-  entries:
-  - name: Opporozidone
-    amount: 200
-
-- type: cargoBounty
-  id: BountyArtifactMany
-  reward: 500
-  description: bounty-description-artifact
-  entries:
-  - name: bounty-item-artifact
-    amount: 5
-    whitelist:
-      components:
-      - XenoArtifact
-  group: ScienceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyBrain
-  reward: 5000
-  description: bounty-description-brain
-  entries:
-  - name: bounty-item-brain
-    amount: 1
-    whitelist:
-      components:
-      - Brain
-
-- type: cargoBounty
-  id: BountyBread
-  reward: 330
-  description: bounty-description-bread
-  entries:
-  - name: bounty-item-bread
-    amount: 6
-    whitelist:
-      tags:
-      - Bread
-    blacklist:
-      tags:
-      - Slice
-  group: ServiceBounty
-  bountyType: PayPer
-
-
-- type: cargoBounty
-  id: BountyCarrot
-  reward: 300
-  description: bounty-description-carrot
-  idPrefix: SS15-
-  entries:
-  - name: bounty-item-carrot
-    amount: 10
-    whitelist:
-      tags:
-      - Carrot
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyCarrotFries
-  reward: 500
-  description: bounty-description-carrot-fries
-  entries:
-  - name: bounty-item-carrot-fries
-    amount: 5
-    whitelist:
-      tags:
-      - CarrotFries
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyCarp
-  reward: 5000
-  description: bounty-description-carp
-  idPrefix: CC
-  entries:
-  - name: bounty-item-carp
-    amount: 1
-    whitelist:
-      tags:
-      - Carp
-  group: HunterBounty
-
-- type: cargoBounty
-  id: BountyClownCostume
-  reward: 2000
-  description: bounty-description-clown-costume
-  entries:
-  - name: bounty-item-clown-mask
-    amount: 1
-    whitelist:
-      tags:
-      - ClownMask
-  - name: bounty-item-clown-shoes
-    amount: 1
-    whitelist:
-      tags:
-      - ClownShoes
-  group: ExplorationBounty
-
-- type: cargoBounty
-  id: BountyCorn
-  reward: 200
-  description: bounty-description-corn
-  entries:
-  - name: bounty-item-corn
-    amount: 10
-    whitelist:
-      tags:
-      - Corn
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyCrayon
-  reward: 125
-  description: bounty-description-crayon
-  entries:
-  - name: bounty-item-crayon
-    amount: 12
-    whitelist:
-      tags:
-      - Crayon
-  group: ExplorationBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyCubanCarp
-  reward: 10000
-  description: bounty-description-cuban-carp
-  idPrefix: CC
-  entries:
-  - name: bounty-item-cuban-carp
-    amount: 1
-    whitelist:
-      tags:
-      - CubanCarp
-  group: HunterBounty
-
-- type: cargoBounty
-  id: BountyDonut
-  reward: 350
-  description: bounty-description-donut
-  idPrefix: CC
-  entries:
-  - name: bounty-item-donut
-    amount: 10
-    whitelist:
-      tags:
-      - Donut
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyFigurine
-  reward: 2000
-  description: bounty-description-figurine
-  entries:
-  - name: bounty-item-figurine
-    amount: 2
-    whitelist:
-      tags:
-      - Figurine
-  group: ExplorationBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyFlower
-  reward: 660
-  description: bounty-description-flower
-  idPrefix: CC
-  entries:
-  - name: bounty-item-flower
-    amount: 3
-    whitelist:
-      tags:
-      - Flower
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyGalaxyThistle
-  reward: 500
-  description: bounty-description-galaxythistle
-  entries:
-  - name: bounty-item-galaxythistle
-    amount: 10
-    whitelist:
-      tags:
-      - Galaxythistle
-  bountyType: PayPer
-
 - type: cargoBounty
   id: BountyHandcuffs
   reward: 500
@@ -425,32 +5,19 @@
   idPrefix: CC
   entries:
   - name: bounty-item-handcuffs
-    amount: 2
+    amount: 20
     whitelist:
       components:
       - Handcuff
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountyInstrument
-  reward: 1000
-  description: bounty-description-instrument
-  entries:
-  - name: bounty-item-instrument
-    amount: 2
-    whitelist:
-      components:
-      - Instrument
-  group: ExplorationBounty
-  bountyType: PayPer
-
 - type: cargoBounty
   id: BountyKnife
   reward: 500
   description: bounty-description-knife
   entries:
   - name: bounty-item-knife
-    amount: 4
+    amount: 20
     whitelist:
       components:
       - Sharp
@@ -458,122 +25,20 @@
       - UtilityKnife # required because retracted utility knives are not Sharp
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountyLemon
-  reward: 250
-  description: bounty-description-lemon
-  entries:
-  - name: bounty-item-lemon
-    amount: 10
-    whitelist:
-      tags:
-      - Lemon
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyLime
-  reward: 250
-  description: bounty-description-lime
-  idPrefix: CC
-  entries:
-  - name: bounty-item-lime
-    amount: 10
-    whitelist:
-      tags:
-      - Lime
-  group: ServiceBounty
-  bountyType: PayPer
-
-
-- type: cargoBounty
-  id: BountyLung
-  reward: 1000
-  description: bounty-description-lung
-  entries:
-  - name: bounty-item-lung
-    amount: 1
-    whitelist:
-      components:
-      - Lung
 
 - type: cargoBounty
   id: BountyMonkeyCube
-  reward: 1000
+  reward: 500
   description: bounty-description-monkey-cube
   idPrefix: CC
   entries:
   - name: bounty-item-monkey-cube
-    amount: 2
+    amount: 20
     whitelist:
       tags:
       - MonkeyCube
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountyMouse
-  reward: 2500
-  description: bounty-description-mouse
-  idPrefix: SS13-
-  entries:
-  - name: bounty-item-mouse
-    amount: 1
-    whitelist:
-      tags:
-      - Mouse
-
-- type: cargoBounty
-  id: BountyPancake
-  reward: 500
-  description: bounty-description-pancake
-  entries:
-  - name: bounty-item-pancake
-    amount: 10
-    whitelist:
-      tags:
-      - Pancake
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyPen
-  reward: 200
-  description: bounty-description-pen
-  entries:
-  - name: bounty-item-pen
-    amount: 3
-    whitelist:
-      tags:
-      - Pen
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyPercussion
-  reward: 1500
-  description: bounty-description-percussion
-  entries:
-  - name: bounty-item-percussion
-    amount: 1
-    whitelist:
-      tags:
-      - PercussionInstrument
-  group: ExplorationBounty
-
-- type: cargoBounty
-  id: BountyPie
-  reward: 3141
-  description: bounty-description-pie
-  entries:
-  - name: bounty-item-pie
-    amount: 1
-    whitelist:
-      tags:
-      - Pie
-    blacklist:
-      tags:
-      - Slice
-  group: ServiceBounty
-
 - type: cargoBounty
   id: BountyPrisonUniform
   reward: 1330
@@ -581,27 +46,12 @@
   idPrefix: TG
   entries:
   - name: bounty-item-prison-uniform
-    amount: 3
+    amount: 7
     whitelist:
       tags:
       - PrisonUniform
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountyRadio
-  reward: 620
-  description: bounty-description-radio
-  entries:
-  - name: bounty-item-radio
-    amount: 4
-    whitelist:
-      components:
-      - Headset
-      - RadioMicrophone
-      tags:
-      - Radio
-  bountyType: PayPer
-
 - type: cargoBounty
   id: BountyShiv
   reward: 500
@@ -609,32 +59,19 @@
   idPrefix: SYN
   entries:
   - name: bounty-item-shiv
-    amount: 5
+    amount: 20
     whitelist:
       tags:
       - Shiv
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountySoup
-  reward: 400
-  description: bounty-description-soup
-  entries:
-  - name: bounty-item-soup
-    amount: 5
-    whitelist:
-      tags:
-      - Soup
-  bountyType: PayPer
-  group: ServiceBounty
-
 - type: cargoBounty
   id: BountySpear
   reward: 500
   description: bounty-description-spear
   entries:
   - name: bounty-item-spear
-    amount: 4
+    amount: 20
     whitelist:
       tags:
       - Spear
@@ -646,26 +83,12 @@
   description: bounty-description-syringe
   entries:
   - name: bounty-item-syringe
-    amount: 10
+    amount: 50
     whitelist:
       tags:
       - Syringe
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountyTechDisk
-  reward: 2500
-  description: bounty-description-tech-disk
-  idPrefix: SS13-
-  entries:
-  - name: bounty-item-tech-disk
-    amount: 4
-    whitelist:
-      components:
-      - TechnologyDisk
-  group: ScienceBounty
-  bountyType: PayPer
-
 - type: cargoBounty
   id: BountyToolbox
   reward: 415
@@ -673,61 +96,10 @@
   idPrefix: CC
   entries:
   - name: bounty-item-toolbox
-    amount: 6
-    whitelist:
-      tags:
-      - Toolbox
-  bountyType: PayPer
-
-
-- type: cargoBounty
-  id: BountyTrash
-  reward: 50
-  description: bounty-description-trash
-  entries:
-  - name: bounty-item-trash
-    amount: 10
-    whitelist:
-      tags:
-      - Trash
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyAnomalyCore
-  reward: 10000
-  description: bounty-description-anomaly-core
-  entries:
-  - name: bounty-item-anomaly-core
-    amount: 1
-    whitelist:
-      components:
-      - AnomalyCore
-  group: ScienceBounty
-
-- type: cargoBounty
-  id: BountyBorgModule
-  reward: 2000
-  description: bounty-description-borg-module
-  entries:
-  - name: bounty-item-borg-module
-    amount: 2
-    whitelist:
-      components:
-      - BorgModule
-  group: ScienceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyArtifactFragment
-  reward: 500
-  description: bounty-description-artifact-fragment
-  entries:
-  - name: bounty-item-artifact-fragment
     amount: 20
     whitelist:
       tags:
-      - ArtifactFragment
-  group: ScienceBounty
+      - Toolbox
   bountyType: PayPer
 
 - type: cargoBounty
@@ -737,7 +109,7 @@
   idPrefix: UNTH
   entries:
   - name: bounty-item-organs
-    amount: 8
+    amount: 30
     whitelist:
       components:
       - Organ
@@ -745,11 +117,11 @@
 
 - type: cargoBounty
   id: BountyLabeler
-  reward: 1000
+  reward: 200
   description: bounty-description-labeler
   entries:
   - name: bounty-item-labeler
-    amount: 3
+    amount: 35
     whitelist:
       components:
       - HandLabeler
@@ -757,12 +129,12 @@
 
 - type: cargoBounty
   id: BountyWarmCloth
-  reward: 500
+  reward: 300
   description: bounty-description-warm-cloth
   idPrefix: UNTH
   entries:
   - name: bounty-item-warm-cloth
-    amount: 4
+    amount: 35
     whitelist:
       components:
       - TemperatureProtection
@@ -780,11 +152,10 @@
   idPrefix: UNTH
   entries:
   - name: bounty-item-battery
-    amount: 10
+    amount: 20
     whitelist:
       components:
       - Battery
-  group: EngineeringBounty
   bountyType: PayPer
 
 - type: cargoBounty
@@ -803,83 +174,13 @@
       - PowerCell
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountyFood
-  reward: 100
-  description: bounty-description-food
-  idPrefix: UNTH
-  entries:
-  - name: bounty-item-food
-    amount: 30
-    whitelist:
-      tags:
-      - Meat
-    blacklist:
-      components:
-      - SliceableFood
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyFruit
-  reward: 120
-  description: bounty-description-fruit
-  entries:
-  - name: bounty-item-fruit
-    amount: 20
-    whitelist:
-      tags:
-      - Fruit
-    blacklist:
-      tags:
-      - Slice
-      - Cake
-      - Pie
-      - Bread
-      - Pistachios
-      - Creamsicle
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyVegetable
-  reward: 150
-  description: bounty-description-vegetable
-  entries:
-  - name: bounty-item-vegetable
-    amount: 20
-    whitelist:
-      tags:
-      - Vegetable
-    blacklist:
-      tags:
-      - Slice
-      - Cake
-      - Pie
-      - Bread
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyChili
-  reward: 400
-  description: bounty-description-chili
-  entries:
-  - name: bounty-item-chili
-    amount: 5
-    whitelist:
-      tags:
-      - ChiliBowl
-  group: ServiceBounty
-  bountyType: PayPer
-
 - type: cargoBounty
   id: BountyBedsheet
-  reward: 1000
+  reward: 300
   description: bounty-description-bedsheet
   entries:
   - name: bounty-item-bedsheet
-    amount: 3
+    amount: 30
     whitelist:
       tags:
       - Bedsheet
@@ -887,64 +188,26 @@
 
 - type: cargoBounty
   id: BountyBandana
-  reward: 500
+  reward: 300
   description: bounty-description-bandana
   entries:
   - name: bounty-item-bandana
-    amount: 4
+    amount: 30
     whitelist:
       tags:
       - Bandana
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountySteak
-  reward: 500
-  description: bounty-description-steak
-  entries:
-  - name: bounty-item-steak
-    amount: 4
-    whitelist:
-      tags:
-      - Steak
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyBanana
-  reward: 600
-  description: bounty-description-banana
-  entries:
-  - name: bounty-item-banana
-    amount: 10
-    whitelist:
-      tags:
-      - Banana
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyBeer
-  reward: 660
-  description: bounty-description-beer
-  entries:
-  - name: bounty-item-beer
-    amount: 6
-    whitelist:
-      tags:
-      - Beer
-  bountyType: PayPer
-
 - type: cargoBounty
   id: BountyHiVizVest
-  reward: 830
+  reward: 450
   description: bounty-description-hi-viz-vest
   entries:
   - name: bounty-item-hi-viz-vest
-    amount: 3
+    amount: 20
     whitelist:
       tags:
       - HiViz
-  group: EngineeringBounty
   bountyType: PayPer
 
 - type: cargoBounty
@@ -965,373 +228,20 @@
   description: bounty-description-medkit-box
   entries:
   - name: bounty-item-medkit-box
-    amount: 4
+    amount: 20
     whitelist:
       tags:
       - Medkit
   bountyType: PayPer
 
-- type: cargoBounty
-  id: BountyCardboardBox
-  reward: 500
-  description: bounty-description-cardboard-box
-  entries:
-  - name: bounty-item-cardboard-box
-    amount: 10
-    whitelist:
-      tags:
-      - BoxCardboard
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyWine
-  reward: 750
-  description: bounty-description-wine
-  entries:
-  - name: bounty-item-wine
-    amount: 2
-    whitelist:
-      tags:
-      - Wine
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyCottonBoll
-  reward: 800
-  description: bounty-description-cotton-boll
-  entries:
-  - name: bounty-item-cotton-boll
-    amount: 10
-    whitelist:
-      tags:
-      - CottonBoll
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyMicrowaveMachineBoard
-  reward: 1000
-  description: bounty-description-microwave-machine-board
-  entries:
-  - name: bounty-item-microwave-machine-board
-    amount: 2
-    whitelist:
-      tags:
-      - MicrowaveMachineBoard
-  bountyType: PayPer
-
 - type: cargoBounty
   id: BountyFlashes
   reward: 500
   description: bounty-description-flashes
   entries:
   - name: bounty-item-flash
-    amount: 6
+    amount: 20
     whitelist:
       components:
       - Flash
-  group: ScienceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyRing
-  reward: 3750
-  description: bounty-description-ring
-  entries:
-  - name: bounty-item-ring
-    amount: 2
-    whitelist:
-      tags:
-      - Ring
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountySteel
-  reward: 100
-  description: bounty-description-steel
-  entries:
-    - name: bounty-item-steel
-      amount: 20
-      whitelist:
-        tags:
-        - Steel
-  group: EngineeringBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyGold
-  reward: 300
-  description: bounty-description-gold
-  entries:
-    - name: bounty-item-gold
-      amount: 10
-      whitelist:
-        tags:
-        - Gold
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountySilver
-  reward: 300
-  description: bounty-description-silver
-  entries:
-    - name: bounty-item-silver
-      amount: 10
-      whitelist:
-        tags:
-        - Silver
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyBrass
-  reward: 150
-  description: bounty-description-brass
-  entries:
-    - name: bounty-item-brass
-      amount: 20
-      whitelist:
-        tags:
-        - Brass
-  group: ScienceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyPlasteel
-  reward: 400
-  description: bounty-description-plasteel
-  entries:
-    - name: bounty-item-plasteel
-      amount: 20
-      whitelist:
-        tags:
-        - Plasteel
-  group: EngineeringBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyPlasma
-  reward: 300
-  description: bounty-description-plasma
-  entries:
-    - name: bounty-item-plasma
-      amount: 10
-      whitelist:
-        tags:
-        - Plasma
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyPlastic
-  reward: 150
-  description: bounty-description-plastic
-  entries:
-    - name: bounty-item-plastic
-      amount: 20
-      whitelist:
-        tags:
-        - Plastic
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyWood
-  reward: 100
-  description: bounty-description-wood
-  entries:
-    - name: bounty-item-wood
-      amount: 30
-      whitelist:
-        tags:
-        - Wood
-  group: ServiceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyUranium
-  reward: 265
-  description: bounty-description-uranium
-  entries:
-    - name: bounty-item-uranium
-      amount: 30
-      whitelist:
-        tags:
-        - Uranium
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyBananium
-  reward: 500
-  description: bounty-description-bananium
-  entries:
-    - name: bounty-item-bananium
-      amount: 20
-      whitelist:
-        tags:
-        - Bananium
-  group: ScienceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyCoal
-  reward: 75
-  description: bounty-description-coal
-  entries:
-    - name: bounty-item-coal
-      amount: 15
-      whitelist:
-        tags:
-        - Coal
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyDiamonds
-  reward: 1000
-  description: bounty-description-diamond
-  entries:
-    - name: bounty-item-diamond
-      amount: 20
-      whitelist:
-        tags:
-        - Diamond
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyCoins
-  reward: 300
-  description: bounty-description-coins
-  entries:
-  - name: bounty-item-coins
-    amount: 10
-    whitelist:
-      components:
-      - NFCoin # Coins have no tag but have a unique component
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyCPU
-  reward: 1500
-  description: bounty-description-cpu
-  entries:
-  - name: bounty-item-cpu
-    amount: 5
-    whitelist:
-      tags:
-      - TreasureOldCPU # Supercharged CPU
-  group: ScienceBounty
   bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyOldComputer
-  reward: 1500
-  description: bounty-description-old-computer
-  entries:
-  - name: bounty-item-old-computer
-    amount: 5
-    whitelist:
-      tags:
-      - TreasureOldComputer # Hard drive, floppy drive, CD drive
-  group: ScienceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: TreasureDataDisk
-  reward: 1500
-  description: bounty-description-data-disk
-  entries:
-  - name: bounty-item-data-disk
-    amount: 2
-    whitelist:
-      tags:
-      - TreasureDataDisk # Salvage data disk
-  group: ScienceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: TreasureSampleTube
-  reward: 1500
-  description: bounty-description-sample-tube
-  entries:
-  - name: bounty-item-sample-tube
-    amount: 5
-    whitelist:
-      tags:
-      - TreasureSampleTube # Salvage sample tube
-  group: ScienceBounty
-  bountyType: PayPer
-
-- type: cargoBounty
-  id: BountyAnomalyScience
-  reward: 7500
-  description: bounty-description-anomalyscience
-  entries:
-    - name: bounty-item-anomalyscanner
-      amount: 1
-      whitelist:
-        tags:
-        - AnomalyScanner
-    - name: bounty-item-anomalylocator
-      amount: 1
-      whitelist:
-        tags:
-        - AnomalyLocator
-    - name: bounty-item-apeboard
-      amount: 1
-      whitelist:
-        tags:
-        - ApeCircuitboard
-  group: ScienceBounty
-
-- type: cargoBounty ##Commented out because non functional currently, needs troubleshooting with tags
-  id: BountyRipley
-  reward: 12500
-  description: bounty-description-ripley
-  entries:
-    - name: bounty-item-ripleyleftleg
-      amount: 1
-      whitelist:
-        tags:
-        - RipleyLLeg
-    - name: bounty-item-ripleyleftarm
-      amount: 1
-      whitelist:
-        tags:
-        - RipleyLArm
-    - name: bounty-item-ripleyrightleg
-      amount: 1
-      whitelist:
-        tags:
-        - RipleyRLeg
-    - name: bounty-item-ripleyrightarm
-      amount: 1
-      whitelist:
-        tags:
-        - RipleyRArm
-    - name: bounty-item-ripleycentral
-      amount: 1
-      whitelist:
-        tags:
-        - RipleyCentralControlModule
-    - name: bounty-item-ripleyperipheral
-      amount: 1
-      whitelist:
-        tags:
-        - RipleyPeripheralsControlModule
-    - name: bounty-item-powercell
-      amount: 1
-      whitelist:
-        tags:
-        - PowerCell
-    - name: bounty-item-steel
-      amount: 5
-      whitelist:
-        tags:
-        - Steel
-    - name: bounty-item-rod
-      amount: 10
-      whitelist:
-        tags:
-        - PartRodMetal
-    - name: bounty-item-lvcable
-      amount: 1
-      whitelist:
-        tags:
-        - CableCoil
-  group: ScienceBounty
diff --git a/Resources/Prototypes/Catalog/Bounties/explorationbounties.yml b/Resources/Prototypes/Catalog/Bounties/explorationbounties.yml
new file mode 100644
index 00000000000..61f841a0cbc
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/explorationbounties.yml
@@ -0,0 +1,107 @@
+
+- type: cargoBounty
+  id: BountyTechDisk
+  reward: 2500
+  idPrefix: SS13-
+  entries:
+  - name: bounty-item-tech-disk
+    amount: 4
+    whitelist:
+      components:
+      - TechnologyDisk
+  group: ExplorationBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyCoins
+  reward: 1000
+  description: bounty-description-coins
+  entries:
+  - name: bounty-item-coins
+    amount: 10
+    whitelist:
+      components:
+      - NFCoin # Coins have no tag but have a unique component
+  bountyType: PayPer
+  group: ExplorationBounty
+
+- type: cargoBounty
+  id: BountyCPU
+  reward: 1500
+  description: bounty-description-cpu
+  entries:
+  - name: bounty-item-cpu
+    amount: 7
+    whitelist:
+      tags:
+      - TreasureOldCPU # Supercharged CPU
+  group: ExplorationBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyOldComputer
+  reward: 1500
+  description: bounty-description-old-computer
+  entries:
+  - name: bounty-item-old-computer
+    amount: 7
+    whitelist:
+      tags:
+      - TreasureOldComputer # Hard drive, floppy drive, CD drive
+  group: ExplorationBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: TreasureDataDisk
+  reward: 1500
+  description: bounty-description-data-disk
+  entries:
+  - name: bounty-item-data-disk
+    amount: 7
+    whitelist:
+      tags:
+      - TreasureDataDisk # Salvage data disk
+  group: ExplorationBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: TreasureSampleTube
+  reward: 1500
+  description: bounty-description-sample-tube
+  entries:
+  - name: bounty-item-sample-tube
+    amount: 7
+    whitelist:
+      tags:
+      - TreasureSampleTube # Salvage sample tube
+  group: ExplorationBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyRing
+  reward: 3300
+  description: bounty-description-ring
+  entries:
+  - name: bounty-item-ring
+    amount: 3
+    whitelist:
+      tags:
+      - Ring
+  bountyType: PayPer
+  group: ExplorationBounty
+
+- type: cargoBounty
+  id: BountySalvageScrap
+  reward: 500 # 500*20=10000
+  description: bounty-description-salvage-scrap
+  group: ExplorationBounty
+  sprite:
+    sprite: Objects/Materials/Scrap/generic.rsi
+    state: metal-1
+  entries:
+  - name: bounty-item-scrap
+    amount: 20
+    whitelist:
+      tags:
+      - SalvageScrap
+  bountyType: PayPer
diff --git a/Resources/Prototypes/Catalog/Bounties/gasbounties.yml b/Resources/Prototypes/Catalog/Bounties/gasbounties.yml
new file mode 100644
index 00000000000..abb7b8cad73
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/gasbounties.yml
@@ -0,0 +1,103 @@
+- type: cargoBounty
+  id: BountyOxygen
+  reward: 0.55 # 9900
+  gasId: Oxygen
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-oxygen
+    amount: 18000
+
+- type: cargoBounty
+  id: BountyNitrogen
+  reward: 0.5
+  gasId: Nitrogen
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-nitrogen
+    amount: 20000
+
+- type: cargoBounty
+  id: BountyHydrogen
+  reward: 0.75
+  gasId: Hydrogen
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-hydrogen
+    amount: 13000
+
+- type: cargoBounty
+  id: BountyPlasmaGas
+  reward: 0.75
+  gasId: Plasma
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-plasmagas
+    amount: 13000
+
+- type: cargoBounty
+  id: BountyChlorine
+  reward: 2.25
+  gasId: Chlorine
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-chlorine
+    amount: 4500
+
+- type: cargoBounty
+  id: BountyFluorine
+  reward: 2.5
+  gasId: Fluorine
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-fluorine
+    amount: 4000
+
+- type: cargoBounty
+  id: BountyTritium
+  reward: 5
+  description: bounty-description-artifact
+  gasId: Tritium
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-tritium
+    amount: 2000
+
+- type: cargoBounty
+  id: BountyFrezon
+  reward: 10
+  description: bounty-description-artifact
+  gasId: Frezon
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-frezon
+    amount: 1000
+
+- type: cargoBounty
+  id: BountyMethane
+  reward: 2.8
+  description: bounty-description-artifact
+  gasId: Methane
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-methane
+    amount: 3500
+
+- type: cargoBounty
+  id: BountyChlorineTrifluoride
+  reward: 12.5
+  description: bounty-description-artifact
+  gasId: ChlorineTrifluoride
+  group: GasBounty
+  bountyType: PayPerGas
+  entries:
+  - name: bounty-item-chlorinetrifluoride
+    amount: 850
diff --git a/Resources/Prototypes/Catalog/Bounties/groups.yml b/Resources/Prototypes/Catalog/Bounties/groups.yml
index ccb31cc8825..561c3a512ee 100644
--- a/Resources/Prototypes/Catalog/Bounties/groups.yml
+++ b/Resources/Prototypes/Catalog/Bounties/groups.yml
@@ -1,6 +1,6 @@
 - type: cargoBountyGroup
   id: StationBounty
-  name: Cargo
+  name: Manufacturing
 
 - type: cargoBountyGroup
   id: ServiceBounty
@@ -8,7 +8,7 @@
 
 - type: cargoBountyGroup
   id: ExplorationBounty
-  name: Exploration
+  name: Salvage
 
 - type: cargoBountyGroup
   id: HunterBounty
@@ -43,3 +43,15 @@
 - type: cargoBountyGroup
   id: SalvageJobTier3
   name: Salvage 3
+
+- type: cargoBountyGroup
+  id: PrecursorBounty
+  name: Dealer
+
+- type: cargoBountyGroup
+  id: TrivialBounty
+  name: Trivial
+
+- type: cargoBountyGroup
+  id: MaterialBounty
+  name: Materials
diff --git a/Resources/Prototypes/Catalog/Bounties/hunterbounties b/Resources/Prototypes/Catalog/Bounties/hunterbounties
new file mode 100644
index 00000000000..946b368e69e
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/hunterbounties
@@ -0,0 +1,111 @@
+- type: cargoBounty
+  id: BountyCarp
+  reward: 5000
+  description: bounty-description-carp
+  idPrefix: CC
+  entries:
+  - name: bounty-item-carp
+    amount: 2
+    whitelist:
+      tags:
+      - Carp
+  group: HunterBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyCubanCarp
+  reward: 10000
+  description: bounty-description-cuban-carp
+  idPrefix: CC
+  entries:
+  - name: bounty-item-cuban-carp
+    amount: 1
+    whitelist:
+      tags:
+      - CubanCarp
+  group: HunterBounty
+
+- type: cargoBounty
+  id: BountyTeethSpaceCarp
+  reward: 600 # 600*15=9000
+  description: bounty-description-tooth-space-carp
+  group: HunterBounty
+  sprite:
+    sprite: Mobs/Aliens/Carps/space.rsi
+    state: icon
+  entries:
+  - name: bounty-item-tooth-space-carp
+    amount: 15
+    whitelist:
+      tags:
+      - ToothSpaceCarp
+  bountyType: PayPer
+
+  id: BountyTeethSharkminnow
+  reward: 3000 # 3000*3=9000
+  description: bounty-description-tooth-sharkminnow
+  group: HunterBounty
+  sprite:
+    sprite: Mobs/Aliens/Carps/sharkminnow.rsi
+    state: icon
+  entries:
+  - name: bounty-item-tooth-sharkminnow
+    amount: 3
+    whitelist:
+      tags:
+      - ToothSharkminnow
+  bountyType: PayPer
+
+
+- type: cargoBounty
+  id: BountyBear
+  reward: 750 # 750*13=9750
+  description: bounty-description-bear
+  entries:
+    - name: bounty-item-bearmeat
+      amount: 13
+      whitelist:
+        tags:
+        - BearMeat
+  group: HunterBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountySpider
+  reward: 1000
+  description: bounty-description-spider
+  entries:
+    - name: bounty-item-spidermeat
+      amount: 10
+      whitelist:
+        tags:
+        - SpiderMeat
+  group: HunterBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountySnake
+  reward: 1000
+  description: bounty-description-snake
+  entries:
+    - name: bounty-item-snakemeat
+      amount: 10
+      whitelist:
+        tags:
+        - SnakeMeat
+  group: HunterBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyXeno
+  reward: 1700 # 1700*5=8500
+  description: bounty-description-xeno
+  entries:
+    - name: bounty-item-xenomeat
+      amount: 5
+      whitelist:
+        tags:
+        - XenoMeat
+  group: HunterBounty
+  bountyType: PayPer
+
diff --git a/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml b/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml
index 602a3969746..cfd04324256 100644
--- a/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml
+++ b/Resources/Prototypes/Catalog/Bounties/infrastructurelevels.yml
@@ -6,12 +6,11 @@
   markets:
     - market
   groups:
-    StationBounty : 2
-    ServiceBounty : 2
+    StationBounty : 1
+    MaterialBounty : 1
+    ServiceBounty : 1
     GasBounty : 1
     ReagentBounty : 1
-    EngineeringBounty : 1
-
   income: -5000
 
 - type: infrastructureLevel
@@ -23,13 +22,13 @@
     - market
     - market2
   groups:
-    StationBounty : 3
-    ServiceBounty : 3
+    StationBounty : 2
+    MaterialBounty : 2
+    ServiceBounty : 2
     GasBounty : 2
     ReagentBounty : 2
-    EngineeringBounty : 2
   income: 0
-
+  level: 2
 - type: infrastructureLevel
   id: ILevelGeneral3
   demotionXP: 650
@@ -40,13 +39,14 @@
     - market2
     - market3
   groups:
-    StationBounty : 4
-    ServiceBounty : 4
+    StationBounty : 3
+    MaterialBounty : 3
+    ServiceBounty : 2
+    GasBounty : 2
+    ReagentBounty : 2
     HunterBounty : 1
-    GasBounty : 3
-    ReagentBounty : 3
-    EngineeringBounty : 2
   income: 10000
+  level: 3
 
 - type: infrastructureLevel
   id: ILevelGeneral4
@@ -59,13 +59,14 @@
     - market3
     - market4
   groups:
-    StationBounty : 6
-    ServiceBounty : 6
+    StationBounty : 4
+    MaterialBounty : 4
+    ServiceBounty : 3
+    GasBounty : 3
+    ReagentBounty : 3
     HunterBounty : 2
-    GasBounty : 4
-    ReagentBounty : 4
-    EngineeringBounty : 3
   income: 30000
+  level: 4
 
 - type: infrastructureLevel
   id: ILevelScience1
@@ -74,11 +75,12 @@
   name: Simple Research Outpost (1)
   markets:
     - sciencemarket
+    - explorermarket
   groups:
     ScienceBounty : 2
-    StationBounty : 2
+    MaterialBounty : 2
     ReagentBounty : 1
-  income: -5000
+  income: 0
 
 - type: infrastructureLevel
   id: ILevelScience2
@@ -88,13 +90,16 @@
   markets:
     - sciencemarket
     - sciencemarket2
+    - explorermarket
+    - explorermarket2
   groups:
     ScienceBounty : 3
-    StationBounty : 2
-    ReagentBounty : 2
+    MaterialBounty : 2
+    ReagentBounty : 1
     GasBounty : 1
     ExplorationBounty : 1
   income: 0
+  level: 2
 
 - type: infrastructureLevel
   id: ILevelScience3
@@ -105,13 +110,17 @@
     - sciencemarket
     - sciencemarket2
     - sciencemarket3
+    - explorermarket
+    - explorermarket2
+    - explorermarket3
   groups:
     ScienceBounty : 4
-    StationBounty : 3
-    ReagentBounty : 3
+    MaterialBounty : 2
+    ReagentBounty : 2
     GasBounty : 2
-    ExplorationBounty : 1
+    ExplorationBounty : 2
   income: 10000
+  level: 3
 
 - type: infrastructureLevel
   id: ILevelScience4
@@ -123,13 +132,18 @@
     - sciencemarket2
     - sciencemarket3
     - sciencemarket4
+    - explorermarket
+    - explorermarket2
+    - explorermarket3
+    - explorermarket4
   groups:
-    ScienceBounty : 6
-    StationBounty : 4
-    ReagentBounty : 6
+    ScienceBounty : 5
+    MaterialBounty : 3
+    ReagentBounty : 3
     GasBounty : 3
-    ExplorationBounty : 2
+    ExplorationBounty : 3
   income: 30000
+  level: 4
 
 - type: infrastructureLevel
   id: ILevelHunter1
@@ -157,6 +171,7 @@
     ExplorationBounty : 2
     ScienceBounty : 1
   income: 0
+  level: 2
 
 - type: infrastructureLevel
   id: ILevelHunter3
@@ -172,6 +187,7 @@
     ExplorationBounty : 2
     ScienceBounty : 2
   income: 10000
+  level: 3
 
 - type: infrastructureLevel
   id: ILevelHunter4
@@ -188,6 +204,7 @@
     ExplorationBounty : 3
     ScienceBounty : 3
   income: 30000
+  level: 4
 
 - type: infrastructureLevel
   id: ILevelEngineer1
@@ -197,7 +214,6 @@
   markets:
     - engineermarket
   groups:
-    EngineeringBounty : 4
     ExplorationBounty : 1
     StationBounty : 1
   income: -5000
@@ -211,10 +227,10 @@
     - engineermarket
     - engineermarket2
   groups:
-    EngineeringBounty : 6
     ExplorationBounty : 1
     StationBounty : 2
   income: 0
+  level: 2
 
 - type: infrastructureLevel
   id: ILevelEngineer3
@@ -226,10 +242,10 @@
     - engineermarket2
     - engineermarket3
   groups:
-    EngineeringBounty : 8
     ExplorationBounty : 2
     StationBounty : 2
   income: 10000
+  level: 3
 
 - type: infrastructureLevel
   id: ILevelEngineer4
@@ -242,10 +258,10 @@
     - engineermarket3
     - engineermarket4
   groups:
-    EngineeringBounty : 9
     ExplorationBounty : 3
     StationBounty : 3
   income: 30000
+  level: 4
 
 - type: infrastructureLevel
   id: ILevelExploration1
@@ -273,6 +289,7 @@
     ScienceBounty : 1
     ServiceBounty : 2
   income: 0
+  level: 2
 
 - type: infrastructureLevel
   id: ILevelExploration3
@@ -288,6 +305,7 @@
     ScienceBounty : 2
     ServiceBounty : 2
   income: 10000
+  level: 3
 
 - type: infrastructureLevel
   id: ILevelExploration4
@@ -304,3 +322,4 @@
     ScienceBounty : 3
     ServiceBounty : 3
   income: 30000
+  level: 4
diff --git a/Resources/Prototypes/Catalog/Bounties/materialbounties.yml b/Resources/Prototypes/Catalog/Bounties/materialbounties.yml
new file mode 100644
index 00000000000..8b021e86e60
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/materialbounties.yml
@@ -0,0 +1,158 @@
+
+- type: cargoBounty
+  id: BountySteel
+  reward: 100
+  description: bounty-description-steel
+  entries:
+    - name: bounty-item-steel
+      amount: 100
+      whitelist:
+        tags:
+        - Steel
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyGold
+  reward: 300
+  description: bounty-description-gold
+  entries:
+    - name: bounty-item-gold
+      amount: 35
+      whitelist:
+        tags:
+        - Gold
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountySilver
+  reward: 300
+  description: bounty-description-silver
+  entries:
+    - name: bounty-item-silver
+      amount: 30
+      whitelist:
+        tags:
+        - Silver
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyBrass
+  reward: 150
+  description: bounty-description-brass
+  entries:
+    - name: bounty-item-brass
+      amount: 60
+      whitelist:
+        tags:
+        - Brass
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyPlasteel
+  reward: 400
+  description: bounty-description-plasteel
+  entries:
+    - name: bounty-item-plasteel
+      amount: 25
+      whitelist:
+        tags:
+        - Plasteel
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyPlasma
+  reward: 300
+  description: bounty-description-plasma
+  entries:
+    - name: bounty-item-plasma
+      amount: 30
+      whitelist:
+        tags:
+        - Plasma
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyPlastic
+  reward: 150
+  description: bounty-description-plastic
+  entries:
+    - name: bounty-item-plastic
+      amount: 60
+      whitelist:
+        tags:
+        - Plastic
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyWood
+  reward: 100
+  description: bounty-description-wood
+  entries:
+    - name: bounty-item-wood
+      amount: 100
+      whitelist:
+        tags:
+        - Wood
+  bountyType: PayPer
+  group: MaterialBounty
+
+
+- type: cargoBounty
+  id: BountyUranium
+  reward: 265
+  description: bounty-description-uranium
+  entries:
+    - name: bounty-item-uranium
+      amount: 35
+      whitelist:
+        tags:
+        - Uranium
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyBananium
+  reward: 500
+  description: bounty-description-bananium
+  entries:
+    - name: bounty-item-bananium
+      amount: 20
+      whitelist:
+        tags:
+        - Bananium
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyCoal
+  reward: 75
+  description: bounty-description-coal
+  entries:
+    - name: bounty-item-coal
+      amount: 130
+      whitelist:
+        tags:
+        - Coal
+  bountyType: PayPer
+  group: MaterialBounty
+
+- type: cargoBounty
+  id: BountyDiamonds
+  reward: 1000
+  description: bounty-description-diamond
+  entries:
+    - name: bounty-item-diamond
+      amount: 10
+      whitelist:
+        tags:
+        - Diamond
+  bountyType: PayPer
+  group: MaterialBounty
+
diff --git a/Resources/Prototypes/Catalog/Bounties/precursor.yml b/Resources/Prototypes/Catalog/Bounties/precursor.yml
new file mode 100644
index 00000000000..0df2dec5b3b
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/precursor.yml
@@ -0,0 +1,23 @@
+- type: cargoBounty
+  id: BountyPrecursorSpaceDrugs
+  reward: 40
+  reagentId: SpaceDrugs
+  group: PrecursorBounty
+  bountyType: PayPerReagent
+  successXP: -200
+  idPrefix: PREC-
+  entries:
+  - name: Liquid Space Mirage
+    amount: 250
+
+- type: cargoBounty
+  id: BountyPrecursorDesoxyephedrine
+  reward: 50
+  reagentId: Desoxyephedrine
+  group: PrecursorBounty
+  bountyType: PayPerReagent
+  successXP: -200
+  idPrefix: PREC-
+  entries:
+  - name: Liquid Desoxyephedrine
+    amount: 200
diff --git a/Resources/Prototypes/Catalog/Bounties/reagentbounties.yml b/Resources/Prototypes/Catalog/Bounties/reagentbounties.yml
new file mode 100644
index 00000000000..646c42c79a5
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/reagentbounties.yml
@@ -0,0 +1,89 @@
+- type: cargoBounty
+  id: BountyUnstableMutagen
+  reward: 30
+  description: bounty-description-artifact
+  reagentId: UnstableMutagen
+  group: ReagentBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-unstablemutagen
+    amount: 300
+
+- type: cargoBounty
+  id: BountyAmmonia
+  reward: 5
+  description: bounty-description-artifact
+  reagentId: Ammonia
+  group: ReagentBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-ammonia
+    amount: 2000
+
+- type: cargoBounty
+  id: BountyFrostOil
+  reward: 10
+  description: bounty-description-artifact
+  reagentId: FrostOil
+  group: ReagentBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-frostoil
+    amount: 1000
+
+
+
+- type: cargoBounty
+  id: BountyWeldingFuel
+  reward: 2.5
+  description: bounty-description-artifact
+  reagentId: WeldingFuel
+  group: ReagentBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-weldingfuel
+    amount: 4000
+
+- type: cargoBounty
+  id: BountyAcetone
+  reward: 4
+  description: bounty-description-artifact
+  reagentId: Acetone
+  group: ReagentBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-acetone
+    amount: 2500
+
+- type: cargoBounty
+  id: BountyArithrazine
+  reward: 15
+  description: bounty-description-artifact
+  reagentId: Arithrazine
+  group: ReagentBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-arithrazine
+    amount: 600
+
+- type: cargoBounty
+  id: BountyEpinephrine
+  reward: 10
+  description: bounty-description-artifact
+  reagentId: Epinephrine
+  group: ReagentBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-epinephrine
+    amount: 1000
+
+- type: cargoBounty
+  id: BountyOpporozidone
+  reward: 50
+  description: bounty-description-artifact
+  reagentId: Opporozidone
+  group: ReagentBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-opporozidone
+    amount: 200
diff --git a/Resources/Prototypes/Catalog/Bounties/salvage_jobs.yml b/Resources/Prototypes/Catalog/Bounties/salvage_jobs.yml
index 391d0c753b4..e69de29bb2d 100644
--- a/Resources/Prototypes/Catalog/Bounties/salvage_jobs.yml
+++ b/Resources/Prototypes/Catalog/Bounties/salvage_jobs.yml
@@ -1,184 +0,0 @@
-# THIS HAS BEEN CHANGED FROM salvage_jobs.yml on Wizden upstream (SalvageJobs are being phased out)
-
-- type: cargoBounty
-  id: BountyTeethSpaceCarp
-  reward: 6000
-  description: bounty-description-tooth-space-carp
-  group: HunterBounty
-  sprite:
-    sprite: Mobs/Aliens/Carps/space.rsi
-    state: icon
-  entries:
-  - name: bounty-item-tooth-space-carp
-    amount: 10
-    whitelist:
-      tags:
-      - ToothSpaceCarp
-
-- type: cargoBounty
-  id: BountySalvageScrap
-  reward: 5000
-  description: bounty-description-salvage-scrap
-  group: ExplorationBounty
-  sprite:
-    sprite: Objects/Materials/Scrap/generic.rsi
-    state: metal-1
-  entries:
-  - name: bounty-item-scrap
-    amount: 10
-    whitelist:
-      tags:
-      - SalvageScrap
-
-- type: cargoBounty
-  id: BountySalvageOreGold
-  reward: 5000
-  description: bounty-description-salvage-ore-gold
-  group: ExplorationBounty
-  sprite:
-    sprite: Objects/Materials/ore.rsi
-    state: gold
-  entries:
-  - name: bounty-item-ore-gold
-    amount: 45
-    whitelist:
-      tags:
-      - OreGold
-
-- type: cargoBounty
-  id: BountySalvageOreSilver
-  reward: 5000
-  description: bounty-description-salvage-ore-silver
-  group: ExplorationBounty
-  sprite:
-    sprite: Objects/Materials/ore.rsi
-    state: silver
-  entries:
-  - name: bounty-item-ore-silver
-    amount: 45
-    whitelist:
-      tags:
-      - OreSilver
-
-- type: cargoBounty
-  id: BountyTeethSharkminnow
-  reward: 9000
-  description: bounty-description-tooth-sharkminnow
-  group: HunterBounty
-  sprite:
-    sprite: Mobs/Aliens/Carps/sharkminnow.rsi
-    state: icon
-  entries:
-  - name: bounty-item-tooth-sharkminnow
-    amount: 3
-    whitelist:
-      tags:
-      - ToothSharkminnow
-
-- type: cargoBounty
-  id: BountySalvageOrePlasma
-  reward: 7500
-  description: bounty-description-salvage-ore-plasma
-  group: ExplorationBounty
-  sprite:
-    sprite: Objects/Materials/ore.rsi
-    state: plasma
-  entries:
-  - name: bounty-item-ore-plasma
-    amount: 45
-    whitelist:
-      tags:
-      - OrePlasma
-
-- type: cargoBounty
-  id: BountySalvageOreUranium
-  reward: 7500
-  description: bounty-description-salvage-ore-uranium
-  group: ExplorationBounty
-  sprite:
-    sprite: Objects/Materials/ore.rsi
-    state: uranium
-  entries:
-  - name: bounty-item-ore-uranium
-    amount: 30
-    whitelist:
-      tags:
-      - OreUranium
-
-- type: cargoBounty
-  id: BountySalvageOreBananium
-  reward: 7500
-  description: bounty-description-salvage-ore-bananium
-  group: ExplorationBounty
-  sprite:
-    sprite: Objects/Materials/ore.rsi
-    state: bananium
-  entries:
-  - name: bounty-item-ore-bananium
-    amount: 30
-    whitelist:
-      tags:
-      - OreBananium
-
-- type: cargoBounty
-  id: BountyBear
-  reward: 7500
-  description: bounty-description-bear
-  entries:
-    - name: bounty-item-bearhide
-      amount: 1
-      whitelist:
-        tags:
-        - BearHide
-    - name: bounty-item-bearmeat
-      amount: 6
-      whitelist:
-        tags:
-        - BearMeat
-  group: HunterBounty
-
-- type: cargoBounty
-  id: BountySpider
-  reward: 8000
-  description: bounty-description-spider
-  entries:
-    - name: bounty-item-spidermeat
-      amount: 4
-      whitelist:
-        tags:
-        - SpiderMeat
-    - name: bounty-item-egg-spider
-      amount: 1
-      whitelist:
-        tags:
-        - EggSpider
-  group: HunterBounty
-
-- type: cargoBounty
-  id: BountySnake
-  reward: 9250
-  description: bounty-description-snake
-  entries:
-    - name: bounty-item-snakemeat
-      amount: 6
-      whitelist:
-        tags:
-        - SnakeMeat
-    - name: bounty-item-snakeboots
-      amount: 1
-      whitelist:
-        tags:
-        - SnakeBoots
-  group: HunterBounty
-
-- type: cargoBounty
-  id: BountyXeno
-  reward: 12500
-  description: bounty-description-xeno
-  entries:
-    - name: bounty-item-xenomeat
-      amount: 12
-      whitelist:
-        tags:
-        - XenoMeat
-  group: HunterBounty
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Bounties/sciencebounties.yml b/Resources/Prototypes/Catalog/Bounties/sciencebounties.yml
new file mode 100644
index 00000000000..95e84298d4e
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/sciencebounties.yml
@@ -0,0 +1,141 @@
+- type: cargoBounty
+  id: BountyArtifactGlue
+  reward: 10
+  description: bounty-description-artifact
+  reagentId: ArtifactGlue
+  group: ScienceBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-artifactglue
+    amount: 1000
+
+- type: cargoBounty
+  id: BountyArtifactMany
+  reward: 500
+  description: bounty-description-artifact
+  entries:
+  - name: bounty-item-artifact
+    amount: 20
+    whitelist:
+      components:
+      - XenoArtifact
+  group: ScienceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyAnomalyScience
+  reward: 7500
+  description: bounty-description-anomalyscience
+  entries:
+    - name: bounty-item-anomalyscanner
+      amount: 1
+      whitelist:
+        tags:
+        - AnomalyScanner
+    - name: bounty-item-anomalylocator
+      amount: 1
+      whitelist:
+        tags:
+        - AnomalyLocator
+    - name: bounty-item-apeboard
+      amount: 1
+      whitelist:
+        tags:
+        - ApeCircuitboard
+  group: ScienceBounty
+
+- type: cargoBounty ##Commented out because non functional currently, needs troubleshooting with tags
+  id: BountyRipley
+  reward: 12500
+  description: bounty-description-ripley
+  entries:
+    - name: bounty-item-ripleyleftleg
+      amount: 1
+      whitelist:
+        tags:
+        - RipleyLLeg
+    - name: bounty-item-ripleyleftarm
+      amount: 1
+      whitelist:
+        tags:
+        - RipleyLArm
+    - name: bounty-item-ripleyrightleg
+      amount: 1
+      whitelist:
+        tags:
+        - RipleyRLeg
+    - name: bounty-item-ripleyrightarm
+      amount: 1
+      whitelist:
+        tags:
+        - RipleyRArm
+    - name: bounty-item-ripleycentral
+      amount: 1
+      whitelist:
+        tags:
+        - RipleyCentralControlModule
+    - name: bounty-item-ripleyperipheral
+      amount: 1
+      whitelist:
+        tags:
+        - RipleyPeripheralsControlModule
+    - name: bounty-item-powercell
+      amount: 1
+      whitelist:
+        tags:
+        - PowerCell
+    - name: bounty-item-steel
+      amount: 5
+      whitelist:
+        tags:
+        - Steel
+    - name: bounty-item-rod
+      amount: 10
+      whitelist:
+        tags:
+        - PartRodMetal
+    - name: bounty-item-lvcable
+      amount: 1
+      whitelist:
+        tags:
+        - CableCoil
+  group: ScienceBounty
+
+
+- type: cargoBounty
+  id: BountyAnomalyCore
+  reward: 10000
+  description: bounty-description-anomaly-core
+  entries:
+  - name: bounty-item-anomaly-core
+    amount: 1
+    whitelist:
+      components:
+      - AnomalyCore
+  group: ScienceBounty
+
+- type: cargoBounty
+  id: BountyBorgModule
+  reward: 2000
+  description: bounty-description-borg-module
+  entries:
+  - name: bounty-item-borg-module
+    amount: 2
+    whitelist:
+      components:
+      - BorgModule
+  group: ScienceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyArtifactFragment
+  reward: 500
+  description: bounty-description-artifact-fragment
+  entries:
+  - name: bounty-item-artifact-fragment
+    amount: 20
+    whitelist:
+      tags:
+      - ArtifactFragment
+  group: ScienceBounty
+  bountyType: PayPer
diff --git a/Resources/Prototypes/Catalog/Bounties/servicebounties.yml b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml
new file mode 100644
index 00000000000..b6b529ecb95
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/servicebounties.yml
@@ -0,0 +1,284 @@
+- type: cargoBounty
+  id: BountyPancake
+  reward: 500
+  description: bounty-description-pancake
+  entries:
+  - name: bounty-item-pancake
+    amount: 20
+    whitelist:
+      tags:
+      - Pancake
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyFlour
+  reward: 5
+  description: bounty-description-artifact
+  reagentId: Flour
+  group: ServiceBounty
+  bountyType: PayPerReagent
+  entries:
+  - name: bounty-item-flour
+    amount: 2000
+
+- type: cargoBounty
+  id: BountyBread
+  reward: 330
+  description: bounty-description-bread
+  entries:
+  - name: bounty-item-bread
+    amount: 30
+    whitelist:
+      tags:
+      - Bread
+    blacklist:
+      tags:
+      - Slice
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountySteak
+  reward: 500
+  description: bounty-description-steak
+  entries:
+  - name: bounty-item-steak
+    amount: 20
+    whitelist:
+      tags:
+      - Steak
+  bountyType: PayPer
+  group: ServiceBounty
+
+- type: cargoBounty
+  id: BountyCottonBoll
+  reward: 300
+  description: bounty-description-cotton-boll
+  entries:
+  - name: bounty-item-cotton-boll
+    amount: 30
+    whitelist:
+      tags:
+      - CottonBoll
+  bountyType: PayPer
+  group: ServiceBounty
+
+- type: cargoBounty
+  id: BountyCarrot
+  reward: 300
+  description: bounty-description-carrot
+  idPrefix: SS15-
+  entries:
+  - name: bounty-item-carrot
+    amount: 30
+    whitelist:
+      tags:
+      - Carrot
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyCarrotFries
+  reward: 500
+  description: bounty-description-carrot-fries
+  entries:
+  - name: bounty-item-carrot-fries
+    amount: 20
+    whitelist:
+      tags:
+      - CarrotFries
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyCorn
+  reward: 200
+  description: bounty-description-corn
+  entries:
+  - name: bounty-item-corn
+    amount: 50
+    whitelist:
+      tags:
+      - Corn
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyDonut
+  reward: 350
+  description: bounty-description-donut
+  idPrefix: CC
+  entries:
+  - name: bounty-item-donut
+    amount: 28
+    whitelist:
+      tags:
+      - Donut
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyGalaxyThistle
+  reward: 500
+  description: bounty-description-galaxythistle
+  entries:
+  - name: bounty-item-galaxythistle
+    amount: 10
+    whitelist:
+      tags:
+      - Galaxythistle
+  bountyType: PayPer
+  group: ServiceBounty
+
+- type: cargoBounty
+  id: BountyFlower
+  reward: 660
+  idPrefix: CC
+  entries:
+  - name: bounty-item-flower
+    amount: 16
+    whitelist:
+      tags:
+      - Flower
+  bountyType: PayPer
+  group: ServiceBounty
+
+- type: cargoBounty
+  id: BountyFood
+  reward: 100
+  description: bounty-description-food
+  idPrefix: UNTH
+  entries:
+  - name: bounty-item-food
+    amount: 30
+    whitelist:
+      tags:
+      - Meat
+    blacklist:
+      components:
+      - SliceableFood
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyFruit
+  reward: 120
+  description: bounty-description-fruit
+  entries:
+  - name: bounty-item-fruit
+    amount: 20
+    whitelist:
+      tags:
+      - Fruit
+    blacklist:
+      tags:
+      - Slice
+      - Cake
+      - Pie
+      - Bread
+      - Pistachios
+      - Creamsicle
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyVegetable
+  reward: 150
+  description: bounty-description-vegetable
+  entries:
+  - name: bounty-item-vegetable
+    amount: 20
+    whitelist:
+      tags:
+      - Vegetable
+    blacklist:
+      tags:
+      - Slice
+      - Cake
+      - Pie
+      - Bread
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyChili
+  reward: 400
+  description: bounty-description-chili
+  entries:
+  - name: bounty-item-chili
+    amount: 25
+    whitelist:
+      tags:
+      - ChiliBowl
+  group: ServiceBounty
+  bountyType: PayPer
+
+
+- type: cargoBounty
+  id: BountyLemon
+  reward: 250
+  description: bounty-description-lemon
+  entries:
+  - name: bounty-item-lemon
+    amount: 40
+    whitelist:
+      tags:
+      - Lemon
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyLime
+  reward: 250
+  description: bounty-description-lime
+  idPrefix: CC
+  entries:
+  - name: bounty-item-lime
+    amount: 40
+    whitelist:
+      tags:
+      - Lime
+  group: ServiceBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyPie
+  reward: 2500
+  description: bounty-description-pie
+  entries:
+  - name: bounty-item-pie
+    amount: 4
+    whitelist:
+      tags:
+      - Pie
+    blacklist:
+      tags:
+      - Slice
+  group: ServiceBounty
+
+- type: cargoBounty
+  id: BountySoup
+  reward: 400
+  description: bounty-description-soup
+  entries:
+  - name: bounty-item-soup
+    amount: 25
+    whitelist:
+      tags:
+      - Soup
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyBanana
+  reward: 600
+  description: bounty-description-banana
+  entries:
+  - name: bounty-item-banana
+    amount: 15
+    whitelist:
+      tags:
+      - Banana
+  group: ServiceBounty
+  bountyType: PayPer
+
diff --git a/Resources/Prototypes/Catalog/Bounties/trivialbounties.yml b/Resources/Prototypes/Catalog/Bounties/trivialbounties.yml
new file mode 100644
index 00000000000..e59dc5d990f
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Bounties/trivialbounties.yml
@@ -0,0 +1,186 @@
+- type: cargoBounty
+  id: BountyBrain
+  reward: 5000
+  description: bounty-description-brain
+  entries:
+  - name: bounty-item-brain
+    amount: 2
+    whitelist:
+      components:
+      - Brain
+  bountyType: PayPer
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyClownCostume
+  reward: 2000
+  description: bounty-description-clown-costume
+  entries:
+  - name: bounty-item-clown-mask
+    amount: 1
+    whitelist:
+      tags:
+      - ClownMask
+  - name: bounty-item-clown-shoes
+    amount: 1
+    whitelist:
+      tags:
+      - ClownShoes
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyCrayon
+  reward: 125
+  description: bounty-description-crayon
+  entries:
+  - name: bounty-item-crayon
+    amount: 12
+    whitelist:
+      tags:
+      - Crayon
+  group: TrivialBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyFigurine
+  reward: 2000
+  description: bounty-description-figurine
+  entries:
+  - name: bounty-item-figurine
+    amount: 5
+    whitelist:
+      tags:
+      - Figurine
+  group: TrivialBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyInstrument
+  reward: 1000
+  description: bounty-description-instrument
+  entries:
+  - name: bounty-item-instrument
+    amount: 10
+    whitelist:
+      components:
+      - Instrument
+  group: TrivialBounty
+  bountyType: PayPer
+
+- type: cargoBounty
+  id: BountyLung
+  reward: 1000
+  description: bounty-description-lung
+  entries:
+  - name: bounty-item-lung
+    amount: 1
+    whitelist:
+      components:
+      - Lung
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyMouse
+  reward: 2500
+  description: bounty-description-mouse
+  idPrefix: SS13-
+  entries:
+  - name: bounty-item-mouse
+    amount: 1
+    whitelist:
+      tags:
+      - Mouse
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyPen
+  reward: 200
+  description: bounty-description-pen
+  entries:
+  - name: bounty-item-pen
+    amount: 3
+    whitelist:
+      tags:
+      - Pen
+  bountyType: PayPer
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyPercussion
+  reward: 1500
+  description: bounty-description-percussion
+  entries:
+  - name: bounty-item-percussion
+    amount: 1
+    whitelist:
+      tags:
+      - PercussionInstrument
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyRadio
+  reward: 620
+  description: bounty-description-radio
+  entries:
+  - name: bounty-item-radio
+    amount: 4
+    whitelist:
+      components:
+      - Headset
+      - RadioMicrophone
+      tags:
+      - Radio
+  bountyType: PayPer
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyTrash
+  reward: 50
+  description: bounty-description-trash
+  entries:
+  - name: bounty-item-trash
+    amount: 10
+    whitelist:
+      tags:
+      - Trash
+  bountyType: PayPer
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyWine
+  reward: 750
+  description: bounty-description-wine
+  entries:
+  - name: bounty-item-wine
+    amount: 2
+    whitelist:
+      tags:
+      - Wine
+  bountyType: PayPer
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyBeer
+  reward: 660
+  description: bounty-description-beer
+  entries:
+  - name: bounty-item-beer
+    amount: 15
+    whitelist:
+      tags:
+      - Beer
+  bountyType: PayPer
+  group: TrivialBounty
+
+- type: cargoBounty
+  id: BountyCardboardBox
+  reward: 500
+  description: bounty-description-cardboard-box
+  entries:
+  - name: bounty-item-cardboard-box
+    amount: 20
+    whitelist:
+      tags:
+      - BoxCardboard
+  bountyType: PayPer
+  group: TrivialBounty
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index b7fe116a33a..a757d0f3803 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -82,14 +82,14 @@
   category: cargoproduct-category-name-emergency
   group: market
 
-## Engineermarket
+# ## Engineermarket
 
-- type: cargoProduct
-  id: EmergencyInflatablewallETS
-  icon:
-    sprite: Objects/Misc/inflatable_wall.rsi
-    state: item_wall
-  product: CrateEmergencyInflatablewall
-  cost: 500
-  category: cargoproduct-category-name-emergency
-  group: engineermarket
+# - type: cargoProduct
+#   id: EmergencyInflatablewallETS
+#   icon:
+#     sprite: Objects/Misc/inflatable_wall.rsi
+#     state: item_wall
+#   product: CrateEmergencyInflatablewall
+#   cost: 500
+#   category: cargoproduct-category-name-emergency
+#   group: engineermarket
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index a37360a0f0f..14178d359c6 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -168,194 +168,194 @@
   category: cargoproduct-category-name-engineering
   group: market
 
-#- type: cargoProduct
-#  id: LockerCE
-#  icon:
-#    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
-#    state: icon
-#  product: LockerChiefEngineerFilledHardsuit
-#  cost: 12500
-#  category: cargoproduct-category-name-engineering
-#  group: market
-
-## Engineering market discounts
-
-- type: cargoProduct
-  id: EngineeringCableLvETS
-  icon:
-    sprite: Objects/Tools/cable-coils.rsi
-    state: coillv-30
-  product: CrateEngineeringCableLV
-  cost: 150
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringCableMvETS
-  icon:
-    sprite: Objects/Tools/cable-coils.rsi
-    state: coilmv-30
-  product: CrateEngineeringCableMV
-  cost: 300
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringCableHvETS
-  icon:
-    sprite: Objects/Tools/cable-coils.rsi
-    state: coilhv-30
-  product: CrateEngineeringCableHV
-  cost: 450
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringFoamGrenadeETS
-  icon:
-    sprite: Objects/Weapons/Grenades/metalfoam.rsi
-    state: icon
-  product: CrateEngineeringFoamGrenade
-  cost: 2000
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringCableBulkETS
-  icon:
-    sprite: Objects/Tools/cable-coils.rsi
-    state: coilall-30
-  product: CrateEngineeringCableBulk
-  cost: 800
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringElectricalSuppliesETS
-  icon:
-    sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
-    state: icon
-  product: CrateEngineeringElectricalSupplies
-  cost: 3000
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: StationBeaconBundleETS
-  icon:
-    sprite: Objects/Devices/station_beacon.rsi
-    state: icon
-  product: CrateEngineeringStationBeaconBundle
-  cost: 600
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
 - type: cargoProduct
-  id: EngineeringJetpackETS
-  icon:
-    sprite: Objects/Tanks/Jetpacks/blue.rsi
-    state: icon
-  product: CrateEngineeringJetpack
-  cost: 1250
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringMiniJetpackETS
-  icon:
-    sprite: Objects/Tanks/Jetpacks/mini.rsi
-    state: icon
-  product: CrateEngineeringMiniJetpack
-  cost: 750
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: AirlockKitETS
-  icon:
-    sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
-    state: icon
-  product: CrateAirlockKit
-  cost: 1000
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EvaKitETS
-  icon:
-    sprite: Clothing/Head/Helmets/eva.rsi
-    state: icon
-  product: CrateEvaKit
-  cost: 3500
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringRCDAmmoETS
-  icon:
-    sprite: Objects/Tools/rcd.rsi
-    state: ammo
-  product: CrateRCDAmmo
-  cost: 1500
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringRCDETS
-  icon:
-    sprite: Objects/Tools/rcd.rsi
-    state: icon
-  product: CrateRCD
-  cost: 1000
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringParticleDeceleratorsETS
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/particle_decelerator.rsi
-    state: base
-  product: CrateParticleDecelerators
-  cost: 10000
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: EngineeringSpaceHeaterETS
-  icon:
-    sprite: Structures/Piping/Atmospherics/Portable/portable_sheater.rsi
-    state: sheaterOff
-  product: CrateEngineeringSpaceHeater
-  cost: 300
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: StationAnchorBoardETS
-  icon:
-    sprite: Objects/Misc/module.rsi
-    state: generic
-  product: StationAnchorCircuitboard
-  cost: 8500
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: LockerEngineerETS
-  icon:
-    sprite: Clothing/Head/Hardsuits/engineering.rsi
-    state: icon
-  product: LockerEngineerFilledHardsuit
-  cost: 2000
-  category: cargoproduct-category-name-engineering
-  group: engineermarket
-
-- type: cargoProduct
-  id: LockerCEETS
+  id: LockerCE
   icon:
     sprite: Clothing/Head/Hardsuits/engineering-white.rsi
     state: icon
   product: LockerChiefEngineerFilledHardsuit
-  cost: 7500
+  cost: 12500
   category: cargoproduct-category-name-engineering
-  group: engineermarket2
\ No newline at end of file
+  group: market
+
+## Engineering market discounts
+
+# - type: cargoProduct
+#   id: EngineeringCableLvETS
+#   icon:
+#     sprite: Objects/Tools/cable-coils.rsi
+#     state: coillv-30
+#   product: CrateEngineeringCableLV
+#   cost: 150
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringCableMvETS
+#   icon:
+#     sprite: Objects/Tools/cable-coils.rsi
+#     state: coilmv-30
+#   product: CrateEngineeringCableMV
+#   cost: 300
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringCableHvETS
+#   icon:
+#     sprite: Objects/Tools/cable-coils.rsi
+#     state: coilhv-30
+#   product: CrateEngineeringCableHV
+#   cost: 450
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringFoamGrenadeETS
+#   icon:
+#     sprite: Objects/Weapons/Grenades/metalfoam.rsi
+#     state: icon
+#   product: CrateEngineeringFoamGrenade
+#   cost: 2000
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringCableBulkETS
+#   icon:
+#     sprite: Objects/Tools/cable-coils.rsi
+#     state: coilall-30
+#   product: CrateEngineeringCableBulk
+#   cost: 800
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringElectricalSuppliesETS
+#   icon:
+#     sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
+#     state: icon
+#   product: CrateEngineeringElectricalSupplies
+#   cost: 3000
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: StationBeaconBundleETS
+#   icon:
+#     sprite: Objects/Devices/station_beacon.rsi
+#     state: icon
+#   product: CrateEngineeringStationBeaconBundle
+#   cost: 600
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringJetpackETS
+#   icon:
+#     sprite: Objects/Tanks/Jetpacks/blue.rsi
+#     state: icon
+#   product: CrateEngineeringJetpack
+#   cost: 1250
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringMiniJetpackETS
+#   icon:
+#     sprite: Objects/Tanks/Jetpacks/mini.rsi
+#     state: icon
+#   product: CrateEngineeringMiniJetpack
+#   cost: 750
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: AirlockKitETS
+#   icon:
+#     sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
+#     state: icon
+#   product: CrateAirlockKit
+#   cost: 1000
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EvaKitETS
+#   icon:
+#     sprite: Clothing/Head/Helmets/eva.rsi
+#     state: icon
+#   product: CrateEvaKit
+#   cost: 3500
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringRCDAmmoETS
+#   icon:
+#     sprite: Objects/Tools/rcd.rsi
+#     state: ammo
+#   product: CrateRCDAmmo
+#   cost: 1500
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringRCDETS
+#   icon:
+#     sprite: Objects/Tools/rcd.rsi
+#     state: icon
+#   product: CrateRCD
+#   cost: 1000
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringParticleDeceleratorsETS
+#   icon:
+#     sprite: Objects/Weapons/Guns/Battery/particle_decelerator.rsi
+#     state: base
+#   product: CrateParticleDecelerators
+#   cost: 10000
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: EngineeringSpaceHeaterETS
+#   icon:
+#     sprite: Structures/Piping/Atmospherics/Portable/portable_sheater.rsi
+#     state: sheaterOff
+#   product: CrateEngineeringSpaceHeater
+#   cost: 300
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: StationAnchorBoardETS
+#   icon:
+#     sprite: Objects/Misc/module.rsi
+#     state: generic
+#   product: StationAnchorCircuitboard
+#   cost: 8500
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: LockerEngineerETS
+#   icon:
+#     sprite: Clothing/Head/Hardsuits/engineering.rsi
+#     state: icon
+#   product: LockerEngineerFilledHardsuit
+#   cost: 2000
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket
+
+# - type: cargoProduct
+#   id: LockerCEETS
+#   icon:
+#     sprite: Clothing/Head/Hardsuits/engineering-white.rsi
+#     state: icon
+#   product: LockerChiefEngineerFilledHardsuit
+#   cost: 7500
+#   category: cargoproduct-category-name-engineering
+#   group: engineermarket2
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml b/Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml
index f0b05694fb1..ec98abcc139 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_syndicate.yml
@@ -1,22 +1,12 @@
-- type: cargoProduct
-  id: EnergySword
-  icon:
-    sprite: Objects/Weapons/Melee/e_sword.rsi
-    state: e_sword
-  product: EnergySword
-  cost: 15000
-  category: cargoproduct-category-name-syndicate
-  group: syndicatemarket3
-
 - type: cargoProduct
   id: EnergyDagger
   icon:
     sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
     state: e_sword
   product: EnergyDaggerBox
-  cost: 7500
+  cost: 9500
   category: cargoproduct-category-name-syndicate
-  group: syndicatemarket2
+  group: syndicatemarket3
 
 - type: cargoProduct
   id: DoubleEnergySword
@@ -34,6 +24,280 @@
     sprite: Objects/Weapons/Melee/e_shield.rsi
     state: eshield-on
   product: EnergyShield
+  cost: 6500
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket3
+
+- type: cargoProduct
+  id: DecoyKit
+  icon:
+    sprite: Clothing/Back/Duffels/syndicate.rsi
+    state: icon
+  product: ClothingBackpackDuffelSyndicateDecoyKitFilled
+  cost: 600
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+- type: cargoProduct
+  id: MedicalKit
+  icon:
+    sprite: Clothing/Back/Duffels/syndicate.rsi
+    state: icon-med
+  product: ClothingBackpackDuffelSyndicateMedicalBundleFilled
+  cost: 1500
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+- type: cargoProduct
+  id: syndicateEVABundle
+  icon:
+    sprite: Clothing/Back/Duffels/syndicate.rsi
+    state: icon
+  product: ClothingBackpackDuffelSyndicateEVABundle
+  cost: 1500
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+
+
+- type: cargoProduct
+  id: SyndicateToolbox
+  icon:
+    sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi
+    state: icon
+  product: ToolboxSyndicateFilled
+  cost: 1000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+
+- type: cargoProduct
+  id: CrateSyndicateSecure
+  icon:
+    sprite: Structures/Storage/Crates/syndicate_secure.rsi
+    state: icon
+  product: CrateSyndicateSecure
+  cost: 200
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+- type: cargoProduct
+  id: ClothingBackpackDuffelSyndicateFilledStarterKit
+  icon:
+    sprite: Clothing/Back/Duffels/syndicate.rsi
+    state: icon
+  product: ClothingBackpackDuffelSyndicateFilledStarterKit
+  cost: 25000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket4
+
+- type: cargoProduct
+  id: ClothingBackpackDuffelSyndicateAmmoFilled
+  icon:
+    sprite: Clothing/Back/Duffels/syndicate.rsi
+    state: icon-ammo
+  product: ClothingBackpackDuffelSyndicateAmmoFilled
+  cost: 1000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+- type: cargoProduct
+  id: SyndicateMicrowaveFlatpack
+  icon:
+    sprite: Objects/Devices/flatpack.rsi
+    state: base
+  product: SyndicateMicrowaveFlatpack
+  cost: 1500
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+- type: cargoProduct
+  id: EmpImplanter
+  icon:
+    sprite: Objects/Specific/Medical/syndi_implanter.rsi
+    state: implanter1
+  product: EmpImplanter
   cost: 10000
   category: cargoproduct-category-name-syndicate
-  group: syndicatemarket
\ No newline at end of file
+  group: syndicatemarket3
+
+- type: cargoProduct
+  id: ScramImplanter
+  icon:
+    sprite: Objects/Specific/Medical/syndi_implanter.rsi
+    state: implanter1
+  product: ScramImplanter
+  cost: 10000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket3
+
+
+- type: cargoProduct
+  id: ClothingBackpackDuffelSyndicatePyjamaBundle
+  icon:
+    sprite: Clothing/Back/Duffels/syndicate.rsi
+    state: icon
+  product: ClothingBackpackDuffelSyndicatePyjamaBundle
+  cost: 900
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+
+- type: cargoProduct
+  id: ClothingBackpackDuffelSyndicateCarpSuit
+  icon:
+    sprite: Clothing/Back/Duffels/syndicate.rsi
+    state: icon
+  product: ClothingBackpackDuffelSyndicateCarpSuit
+  cost: 600
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+
+- type: cargoProduct
+  id: ChameleonProjector
+  icon:
+    sprite: Objects/Devices/chameleon_projector.rsi
+    state: icon
+  product: ChameleonProjector
+  cost: 7000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket3
+
+- type: cargoProduct
+  id: JetpackBlackFilled
+  icon:
+    sprite: Objects/Tanks/Jetpacks/black.rsi
+    state: icon
+  product: JetpackBlackFilled
+  cost: 2500
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+
+- type: cargoProduct
+  id: WeaponPistolViper
+  icon:
+    sprite: Objects/Weapons/Guns/Pistols/viper.rsi
+    state: icon
+  product: WeaponPistolViper
+  cost: 900
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+- type: cargoProduct
+  id: ClothingHandsKnuckleDustersSyndicate
+  icon:
+    sprite: Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi
+    state: syndicateknuckleduster
+  product: ClothingHandsKnuckleDustersSyndicate
+  cost: 800
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+- type: cargoProduct
+  id: ClothingBeltMilitaryWebbing
+  icon:
+    sprite: Clothing/Belt/militarywebbing.rsi
+    state: icon
+  product: ClothingBeltMilitaryWebbing
+  cost: 2000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+- type: cargoProduct
+  id: WeaponPistolCobra
+  icon:
+    sprite: Objects/Weapons/Guns/Pistols/cobra.rsi
+    state: icon
+  product: WeaponPistolCobra
+  cost: 3000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+- type: cargoProduct
+  id: ClothingHandsGlovesBoxingRiggedBlue
+  icon:
+    sprite: Clothing/Hands/Gloves/Boxing/boxingblue.rsi
+    state: icon
+  product: ClothingHandsGlovesBoxingRiggedBlue
+  cost: 1800
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+- type: cargoProduct
+  id: HypoDartBox
+  icon:
+    sprite: Objects/Fun/Darts/dartbox.rsi
+    state: icon
+  product: HypoDartBox
+  cost: 1800
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+- type: cargoProduct
+  id: ThrowingKnivesKit
+  icon:
+    sprite: Objects/Storage/boxes.rsi
+    state: box
+  product: ThrowingKnivesKit
+  cost: 3000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket2
+
+- type: cargoProduct
+  id: BriefcaseSyndieSniperBundleFilled
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
+  product: BriefcaseSyndieSniperBundleFilled
+  cost: 11000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket3
+
+- type: cargoProduct
+  id: ChemicalSynthesisKit
+  icon: { sprite: Objects/Storage/boxes.rsi, state: box }
+  product: ChemicalSynthesisKit
+  cost: 700
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+- type: cargoProduct
+  id: SlipocalypseClusterSoap
+  icon: { sprite: Objects/Specific/Janitorial/soap.rsi, state: syndie-4 }
+  product: SlipocalypseClusterSoap
+  cost: 700
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+- type: cargoProduct
+  id: BriefcaseWeaponHushpupFilled
+  icon: { sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi, state: icon }
+  product: BriefcaseWeaponHushpupFilled
+  cost: 10000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket3
+
+- type: cargoProduct
+  id: EnergySword
+  icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon }
+  product: EnergySword
+  cost: 10000
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket3
+
+- type: cargoProduct
+  id: ClothingBackpackDuffelSyndicateCostumeClown
+  icon: { sprite: Clothing/Back/Duffels/clown.rsi, state: icon }
+  product: ClothingBackpackDuffelSyndicateCostumeClown
+  cost: 600
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
+- type: cargoProduct
+  id: PersonalCryoMachineCircuitboard
+  icon: { sprite: Objects/Misc/module.rsi, state: engineering }
+  product: PersonalCryoMachineCircuitboard
+  cost: 600
+  category: cargoproduct-category-name-syndicate
+  group: syndicatemarket
+
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index 3e3e0f2f8d6..0d43830694b 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -12,6 +12,8 @@
 - type: entity
   id: BriefcaseSyndieSniperBundleFilled
   parent: BriefcaseBrown
+  name: Sniper Bundle
+  description: An inconspicuous briefcase that contains a Hristov, 10 spare bullets and a convenient disguise.
   suffix: Syndicate, Sniper Bundle
   components:
   - type: EntityTableContainerFill
diff --git a/Resources/Prototypes/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/Catalog/Jukebox/Standard.yml
index d14f5a873ae..2040349efe7 100644
--- a/Resources/Prototypes/Catalog/Jukebox/Standard.yml
+++ b/Resources/Prototypes/Catalog/Jukebox/Standard.yml
@@ -74,4 +74,10 @@
   id: dreaminginspace
   name: Zachariehs - Dreaming in Space
   path:
-    path: /Audio/Jukebox/dreaminginspace.ogg
\ No newline at end of file
+    path: /Audio/Jukebox/dreaminginspace.ogg
+
+- type: jukebox
+  id: Welcome To The Threshold
+  name: mrjajkes - Welcome To The Threshold
+  path:
+    path: /Audio/Lobby/Welcome_To_The_Threshold.ogg
diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/Chemistry/metabolizer_types.yml
index 3f7bf05b35e..013af68d5a9 100644
--- a/Resources/Prototypes/Chemistry/metabolizer_types.yml
+++ b/Resources/Prototypes/Chemistry/metabolizer_types.yml
@@ -44,3 +44,7 @@
 - type: metabolizerType
   id: Arachnid
   name: metabolizer-type-arachnid
+
+- type: metabolizerType
+  id: Goblin
+  name: metabolizer-type-goblin
diff --git a/Resources/Prototypes/Codewords/codeword_generators.yml b/Resources/Prototypes/Codewords/codeword_generators.yml
index c66fd370832..159942b5d4c 100644
--- a/Resources/Prototypes/Codewords/codeword_generators.yml
+++ b/Resources/Prototypes/Codewords/codeword_generators.yml
@@ -4,3 +4,10 @@
   - Adjectives
   - Verbs
   amount: 4
+
+- type: codewordGenerator
+  id: PersistenceCodewordGenerator
+  words:
+  - Adjectives
+  - Verbs
+  amount: 2
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index fa0ac49638f..a62095c387e 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -215,6 +215,16 @@
   coefficients: # To be decided
     Poison: 1
 
+- type: damageModifierSet
+  id: Goblin
+  coefficients:
+    Blunt: 1.25
+    Slash: 1.25
+    Piercing: 1.25
+    Caustic: 0.8
+    Heat: 0.8
+    Poison: 0.8
+
 - type: damageModifierSet
   id: Zombie #Blunt resistant and immune to biological threats, but can be hacked apart and burned
   coefficients:
diff --git a/Resources/Prototypes/Datasets/Names/goblin_female.yml b/Resources/Prototypes/Datasets/Names/goblin_female.yml
new file mode 100644
index 00000000000..2ced1faa0b2
--- /dev/null
+++ b/Resources/Prototypes/Datasets/Names/goblin_female.yml
@@ -0,0 +1,5 @@
+- type: localizedDataset
+  id: names_goblin_female
+  values:
+    prefix: names-goblin-female-dataset-
+    count: 208
diff --git a/Resources/Prototypes/Datasets/Names/goblin_last.yml b/Resources/Prototypes/Datasets/Names/goblin_last.yml
new file mode 100644
index 00000000000..eae167f8bc0
--- /dev/null
+++ b/Resources/Prototypes/Datasets/Names/goblin_last.yml
@@ -0,0 +1,5 @@
+- type: localizedDataset
+  id: names_goblin_last
+  values:
+    prefix: names-goblin-last-dataset-
+    count: 210
diff --git a/Resources/Prototypes/Datasets/Names/goblin_male.yml b/Resources/Prototypes/Datasets/Names/goblin_male.yml
new file mode 100644
index 00000000000..d9c77cae2c2
--- /dev/null
+++ b/Resources/Prototypes/Datasets/Names/goblin_male.yml
@@ -0,0 +1,5 @@
+- type: localizedDataset
+  id: names_goblin_male
+  values:
+    prefix: names-goblin-male-dataset-
+    count: 209
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 9df15922928..74cca8a6901 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -93,8 +93,8 @@
   - type: MeleeWeapon
     damage:
       types:
-        Blunt: 8
-    bluntStaminaDamageFactor: 2
+        Blunt: 0.8
+    bluntStaminaDamageFactor: 0.75
 
 - type: entity
   parent: [ ClothingHandsGlovesBoxingRiggedBase, ClothingHandsGlovesBoxingRed ]
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Grids/stations.yml b/Resources/Prototypes/Entities/Markers/Spawners/Grids/stations.yml
index 2b2ad47acd4..f9bcbad1374 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Grids/stations.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Grids/stations.yml
@@ -129,7 +129,6 @@
         - engineermarket
       - type: StationCargoBountyDatabase
         groups:
-          EngineeringBounty : 3
           StationBounty : 2
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
index ee90a43aae2..1fa163ef7b2 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
@@ -2,7 +2,7 @@
 - type: marking
   id: GauzeLefteyePatch
   bodyPart: Eyes
-  groupWhitelist: [Human, Arachnid]
+  groupWhitelist: [Human, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -15,7 +15,7 @@
 - type: marking
   id: GauzeLefteyePad
   bodyPart: Eyes
-  groupWhitelist: [Human, Reptilian, Arachnid, Vulpkanin]
+  groupWhitelist: [Human, Reptilian, Arachnid, Vulpkanin, Goblin]
   coloring:
     default:
       type:
@@ -28,7 +28,7 @@
 - type: marking
   id: GauzeRighteyePatch
   bodyPart: Eyes
-  groupWhitelist: [Human, Arachnid]
+  groupWhitelist: [Human, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -41,7 +41,7 @@
 - type: marking
   id: GauzeRighteyePad
   bodyPart: Eyes
-  groupWhitelist: [Human, Reptilian, Arachnid, Vulpkanin]
+  groupWhitelist: [Human, Reptilian, Arachnid, Vulpkanin, Goblin]
   coloring:
     default:
       type:
@@ -54,7 +54,7 @@
 - type: marking
   id: GauzeBlindfold
   bodyPart: Eyes
-  groupWhitelist: [Human, Arachnid]
+  groupWhitelist: [Human, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -67,7 +67,7 @@
 - type: marking
   id: GauzeShoulder
   bodyPart: Chest
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -80,7 +80,7 @@
 - type: marking
   id: GauzeStomach
   bodyPart: Chest
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -93,7 +93,7 @@
 - type: marking
   id: GauzeUpperArmRight
   bodyPart: RArm
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -106,7 +106,7 @@
 - type: marking
   id: GauzeLowerArmRight
   bodyPart: RHand
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -119,7 +119,7 @@
 - type: marking
   id: GauzeLeftArm
   bodyPart: LArm
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -132,7 +132,7 @@
 - type: marking
   id: GauzeLowerLegLeft
   bodyPart: LFoot
-  groupWhitelist: [Human, Arachnid]
+  groupWhitelist: [Human, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -145,7 +145,7 @@
 - type: marking
   id: GauzeUpperLegLeft
   bodyPart: LLeg
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -158,7 +158,7 @@
 - type: marking
   id: GauzeUpperLegRight
   bodyPart: RLeg
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -171,7 +171,7 @@
 - type: marking
   id: GauzeLowerLegRight
   bodyPart: RFoot
-  groupWhitelist: [Human, Arachnid]
+  groupWhitelist: [Human, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -184,7 +184,7 @@
 - type: marking
   id: GauzeBoxerWrapRight
   bodyPart: RHand
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -197,7 +197,7 @@
 - type: marking
   id: GauzeBoxerWrapLeft
   bodyPart: LHand
-  groupWhitelist: [Human, Reptilian, Arachnid]
+  groupWhitelist: [Human, Reptilian, Arachnid, Goblin]
   coloring:
     default:
       type:
@@ -210,7 +210,7 @@
 - type: marking
   id: GauzeHead
   bodyPart: Head
-  groupWhitelist: [Human, Reptilian, Arachnid, Moth]
+  groupWhitelist: [Human, Reptilian, Arachnid, Moth, Goblin]
   coloring:
     default:
       type:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index c8c26cd56a0..5776a2b93cd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -222,11 +222,11 @@
     damage:
       types:
         Blunt: 12
-  - type: Produce
-    seedId: steelcap
-  - type: Log
-    spawnedPrototype: SheetSteel1
-    spawnCount: 1
+  # - type: Produce
+  #   seedId: steelcap
+  # - type: Log
+  #   spawnedPrototype: SheetSteel1
+  #   spawnCount: 1
 
 - type: entity
   name: nettle
@@ -1732,8 +1732,8 @@
       food:
         maxVol: 10
         reagents:
-        - ReagentId: Omnizine
-          Quantity: 3
+        # - ReagentId: Omnizine
+        #   Quantity: 3
         - ReagentId: SpaceDrugs
           Quantity: 5
         - ReagentId: Nutriment
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 880f98a73ec..05c203e45ce 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1077,6 +1077,22 @@
       Manipulator: 2
       Steel: 4
 
+- type: entity
+  id: PersonalCryoMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: personal cryopod machine board
+  description: A circuit board for a personal cryopod.
+  components:
+    - type: Sprite
+      state: engineering
+    - type: MachineBoard
+      prototype: CryogenicSleepUnitPersonal
+      stackRequirements:
+        Cable: 5
+        CableMV: 5
+        CableHV: 5
+        Steel: 10
+
 - type: entity
   id: MCTNMachineCircuitboard
   parent: BaseMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 9f1d614a125..4e0e6aeff6d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -107,7 +107,7 @@
     - type: Sprite
       state: cpu_supply
     - type: ComputerBoard
-      prototype: ComputerStationModification
+      prototype: ComputerGridControl
     - type: StaticPrice
       price: 90
 
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 31a3e8b7d2c..944886b6adf 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -452,6 +452,7 @@
       Phoron: 100
   - type: Tag
     tags:
+    - Sheet
     - RawMaterial
     - Phoron
 
diff --git a/Resources/Prototypes/Entities/Objects/Tools/grid_config.yml b/Resources/Prototypes/Entities/Objects/Tools/grid_config.yml
index 9eca762debd..e0dbdbf91c5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/grid_config.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/grid_config.yml
@@ -8,7 +8,7 @@
       sound:
         path: /Audio/Items/multitool_drop.ogg
     - type: Sprite
-      sprite: Objects/Tools/access_configurator.rsi
+      sprite: _Persistence14/Objects/Tools/grid-configurator.rsi
       state: icon
     - type: Item
       size: Small
@@ -27,8 +27,6 @@
         whitelist:
           components:
           - IdCard
-#      denialSound: # pleasing the linter - field denialSound not found in component
-#        path: /Audio/Machines/custom_deny.ogg
       doAfter: 0.5
     - type: UserInterface
       interfaces:
@@ -45,6 +43,28 @@
       containers:
         GridConfig-privilegedId: !type:ContainerSlot
 
+- type: entity
+  parent: BaseItem
+  id: PrecursorExtractor
+  name: secret phrase extractor
+  description: Can be used on a handcuffed, critical or dead person to extract a secret phrase.
+  components:
+    - type: EmitSoundOnLand
+      sound:
+        path: /Audio/Items/multitool_drop.ogg
+    - type: Sprite
+      sprite: Objects/Tools/access_configurator.rsi
+      state: icon
+    - type: Item
+      size: Small
+    - type: Clothing
+      sprite: Objects/Tools/access_configurator.rsi
+      quickEquip: false
+      slots:
+        - Belt
+    - type: PrecursorExtractor
+
+
 - type: entity
   parent: BaseItem
   id: StationTagger
diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
index 76d7ccbfb10..5b816f16c17 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
@@ -47,8 +47,8 @@
   - type: StaticPrice
     price: 40
   - type: LimitedCharges
-    maxCharges: 15
-    lastCharges: 15
+    maxCharges: 30
+    lastCharges: 30
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -94,7 +94,7 @@
     heldPrefix: ammo
   - type: PhysicalComposition
     materialComposition:
-      Steel: 10
-      Plastic: 10
+      Steel: 20
+      Plastic: 20
   - type: StaticPrice
     price: 30
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
index 50468a641ac..9f82233e047 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -260,6 +260,7 @@
   - type: Physics
     bodyType: Static
   - type: AnomalyGenerator
+    requiredMaterial: Phoron
     generatingSound:
       path: /Audio/Machines/anomaly_generate.ogg
     generatingFinishedSound:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
index 40abd4b6558..964ab2ccf9b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -32,6 +32,7 @@
   - type: ApcPowerReceiver
     powerLoad: 200
   - type: ExtensionCableReceiver
+  - type: AccessReader
   - type: WiresPanel
   - type: WiresVisuals
   - type: Machine
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
index 54d9248044f..c861f4e5162 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -100,6 +100,17 @@
       shader: unshaded
       visible: false
       offset: 0, 1
+    # Frontier: linkable thrusters, pirate bounties
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+    - On
+    - Off
+    - Toggle
 
 - type: entity
   parent: Thruster
@@ -277,6 +288,16 @@
     damageModifierSet: Electronic
   - type: StaticPrice
     price: 150
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+    - On
+    - Off
+    - Toggle
 
 - type: entity
   id: GyroscopeUnanchored
diff --git a/Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml b/Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml
index 131caec4a30..101d4b90c68 100644
--- a/Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml
+++ b/Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml
@@ -14,12 +14,6 @@
     layers:
     - state: sleeper_0
       map: ["base"]
-  - type: UserInterface
-    interfaces:
-      enum.CryostorageUIKey.Key:
-        type: CryostorageBoundUserInterface
-  - type: ActivatableUI
-    key: enum.CryostorageUIKey.Key
   - type: AccessReader
     breakOnAccessBreaker: false
     access: [["Cryogenics"]]
@@ -71,6 +65,56 @@
   id: CryogenicSleepUnitSpawnerLateJoin
   suffix: Spawner, LateJoin
   components:
-    - type: ContainerSpawnPoint
-      containerId: storage
-      spawnType: LateJoin
+  - type: ContainerSpawnPoint
+    containerId: storage
+    spawnType: LateJoin
+
+- type: entity
+  parent: CryogenicSleepUnit
+  id: CryogenicSleepUnitPersonal
+  name: personal sleep unit
+  components:
+  - type: Machine
+    board: PersonalCryoMachineCircuitboard
+  - type: Cryostorage
+    personalMode: true
+  - type: ContainerContainer
+    containers:
+      storage: !type:ContainerSlot
+      machine_board: !type:Container
+      machine_parts: !type:Container
+  - type: Construction
+    graph: Machine
+    node: machine
+    containers:
+    - machine_parts
+    - machine_board
+  - type: Anchorable
+    flags:
+    - Anchorable
+    - Unanchorable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+      - !type:ChangeConstructionNodeBehavior
+        node: machineFrame
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
+  - type: EmptyOnMachineDeconstruct
+    containers:
+     - storage
+  - type: Sprite
+    noRot: true
+    sprite: _Persistence14/Structures/cryostorage.rsi
+    layers:
+    - state: sleeper_0
+      map: ["base"]
diff --git a/Resources/Prototypes/Entities/Structures/trapped_fluid_extractor.yml b/Resources/Prototypes/Entities/Structures/trapped_fluid_extractor.yml
index ac253bbab5f..0a8db93d5a5 100644
--- a/Resources/Prototypes/Entities/Structures/trapped_fluid_extractor.yml
+++ b/Resources/Prototypes/Entities/Structures/trapped_fluid_extractor.yml
@@ -142,6 +142,10 @@
 
     - type: AtmosDevice
     - type: TrappedFluidExtractor
+      transferRate: 500
+      maxTransferRate: 500
+      maxPressure: 6500
+      powerUseActive: 900
 
     - type: AmbientSound
       enabled: true
@@ -155,7 +159,7 @@
     - type: PowerSwitch
     - type: PowerConsumer
       voltage: Medium
-      drawRate: 500
+      drawRate: 900
 
     - type: NodeContainer
       examinable: true
diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
index 2590f9b3b6a..5b307057bf1 100644
--- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml
+++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
@@ -60,20 +60,24 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          CarbonDioxide: 152
-          Nitrogen: 48
+          CarbonDioxide: 220
+          Nitrogen: 88
+          Tritium: 100 # Test change for sanity
       variableMixture:
+        ChlorineTrifluoride: # Test change for sanity
+          moles: 100
+          prob: 1
         Oxygen:
-          moles: 155
+          moles: 281
           prob: 0.5
         Nitrogen:
-          moles: 160
+          moles: 290
           prob: 0.5
         CarbonDioxide:
-          moles: 100
+          moles: 145
           prob: 0.5
         Methane:
-          moles: 80
+          moles: 116
           prob: 0.2
 
 
@@ -182,17 +186,17 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          CarbonDioxide: 194
-          Hydrogen: 90
+          CarbonDioxide: 281
+          Hydrogen: 130
       variableMixture:
         Oxygen:
-          moles: 80
+          moles: 145
           prob: 0.1
         Methane:
-          moles: 60
+          moles: 87
           prob: 0.2
         Plasma:
-          moles: 60
+          moles: 87
           prob: 0.5
 
 
@@ -256,11 +260,11 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          CarbonDioxide: 194
-          Nitrogen: 90
+          CarbonDioxide: 281
+          Nitrogen: 163
       variableMixture:
         Plasma:
-          moles: 60
+          moles: 87
           prob: 0.3
 
 - type: entity
@@ -326,17 +330,17 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          CarbonDioxide: 194
-          Hydrogen: 120
+          CarbonDioxide: 281
+          Hydrogen: 174
       variableMixture:
         Oxygen:
-          moles: 100
+          moles: 181
           prob: 0.5
         Methane:
-          moles: 80
+          moles: 116
           prob: 0.5
         Plasma:
-          moles: 80
+          moles: 116
           prob: 0.7
 
 - type: entity
@@ -520,23 +524,23 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Plasma: 240
-          Ammonia: 100
+          Plasma: 348
+          Ammonia: 145
       variableMixture:
         Nitrogen:
-          moles: 60
+          moles: 109
           prob: 0.5
         Plasma:
-          moles: 100
+          moles: 145
           prob: 0.3
         Chlorine:
-          moles: 40
+          moles: 58
           prob: 0.2
         Fluorine:
-          moles: 30
+          moles: 44
           prob: 0.2
         ChlorineTrifluoride:
-          moles: 20
+          moles: 29
           prob: 0.05
 
 - type: entity
@@ -588,23 +592,23 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Plasma: 240
-          Ammonia: 100
+          Plasma: 348
+          Ammonia: 145
       variableMixture:
         Nitrogen:
-          moles: 60
+          moles: 109
           prob: 0.5
         Plasma:
-          moles: 100
+          moles: 145
           prob: 0.1
         Chlorine:
-          moles: 40
+          moles: 58
           prob: 0.2
         Fluorine:
-          moles: 30
+          moles: 44
           prob: 0.2
         ChlorineTrifluoride:
-          moles: 20
+          moles: 29
           prob: 0.05
 
 - type: entity
@@ -653,26 +657,26 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Plasma: 240
-          Ammonia: 100
+          Plasma: 348
+          Ammonia: 145
       variableMixture:
         Nitrogen:
-          moles: 60
+          moles: 109
           prob: 0.6
         Plasma:
-          moles: 100
+          moles: 145
           prob: 0.8
         Tritium:
-          moles: 20
+          moles: 29
           prob: 0.3
         Chlorine:
-          moles: 40
+          moles: 58
           prob: 0.2
         Fluorine:
-          moles: 30
+          moles: 44
           prob: 0.2
         ChlorineTrifluoride:
-          moles: 20
+          moles: 29
           prob: 0.05
 
 
@@ -875,18 +879,18 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 125 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          CarbonDioxide: 270
-          Ammonia: 160
-          Plasma: 20
+          CarbonDioxide: 392
+          Ammonia: 232
+          Plasma: 29
       variableMixture:
         Plasma:
-          moles: 160
+          moles: 232
           prob: 0.5
         Ammonia:
-          moles: 130
+          moles: 188
           prob: 0.5
         Methane:
-          moles: 80
+          moles: 116
           prob: 0.2
 
 - type: entity
@@ -947,18 +951,18 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 125 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          CarbonDioxide: 230
-          Ammonia: 160
-          Plasma: 10
+          CarbonDioxide: 334
+          Ammonia: 232
+          Plasma: 14
       variableMixture:
         Plasma:
-          moles: 160
+          moles: 232
           prob: 0.3
         Ammonia:
-          moles: 100
+          moles: 145
           prob: 0.5
         Methane:
-          moles: 60
+          moles: 87
           prob: 0.2
 
 - type: entity
@@ -1016,18 +1020,18 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 125 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          CarbonDioxide: 150
-          Ammonia: 140
-          Plasma: 50
+          CarbonDioxide: 218
+          Ammonia: 203
+          Plasma: 72
       variableMixture:
         Plasma:
-          moles: 180
+          moles: 261
           prob: 0.7
         Ammonia:
-          moles: 90
+          moles: 130
           prob: 0.5
         Methane:
-          moles: 100
+          moles: 145
           prob: 0.2
 
 - type: entity
@@ -1226,20 +1230,20 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 165 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          WaterVapor: 50
-          Ammonia: 75
+          WaterVapor: 72
+          Ammonia: 109
       variableMixture:
         WaterVapor:
-          moles: 120
+          moles: 174
           prob: 0.7
         Plasma:
-          moles: 160
+          moles: 232
           prob: 0.5
         Oxygen:
-          moles: 110
+          moles: 200
           prob: 0.3
         Methane:
-          moles: 80
+          moles: 116
           prob: 0.2
 
 - type: entity
@@ -1297,20 +1301,20 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 165 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          WaterVapor: 100
-          Ammonia: 75
+          WaterVapor: 145
+          Ammonia: 109
       variableMixture:
         WaterVapor:
-          moles: 120
+          moles: 174
           prob: 0.7
         Plasma:
-          moles: 160
+          moles: 232
           prob: 0.3
         Oxygen:
-          moles: 110
+          moles: 200
           prob: 0.1
         Methane:
-          moles: 40
+          moles: 58
           prob: 0.2
 
 - type: entity
@@ -1360,25 +1364,25 @@
       flags: HideLabel
       color: "#cfcfcf"
     - type: TrappedFluid
-      seedUpperBound: 0.1 # These can be set at default of 1
+      seedUpperBound: 1 # These can be set at default of 1
       seedLowerBound: 0.6
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 165 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          WaterVapor: 50
-          Ammonia: 75
+          WaterVapor: 72
+          Ammonia: 109
       variableMixture:
         WaterVapor:
-          moles: 70
+          moles: 102
           prob: 0.6
         Plasma:
-          moles: 160
+          moles: 232
           prob: 0.7
         Oxygen:
-          moles: 180
+          moles: 326
           prob: 0.5
         Methane:
-          moles: 100
+          moles: 145
           prob: 0.2
 
 - type: entity
@@ -1562,21 +1566,21 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 30 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Oxygen: 90
-          Hydrogen: 50
-          WaterVapor: 256
+          Oxygen: 163
+          Hydrogen: 72
+          WaterVapor: 371
       variableMixture:
         Frezon:
-          moles: 10
+          moles: 14
           prob: 0.05
         Plasma:
-          moles: 110
+          moles: 160
           prob: 0.5
         Oxygen:
-          moles: 130
+          moles: 235
           prob: 0.3
         Hydrogen:
-          moles: 70
+          moles: 102
           prob: 0.5
 
 - type: entity
@@ -1616,20 +1620,20 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 30 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Oxygen: 70
-          WaterVapor: 340
+          Oxygen: 128
+          WaterVapor: 493
       variableMixture:
         Frezon:
-          moles: 3
+          moles: 4
           prob: 0.1
         Plasma:
-          moles: 90
+          moles: 130
           prob: 0.3
         Oxygen:
-          moles: 90
+          moles: 163
           prob: 0.1
         Hydrogen:
-          moles: 70
+          moles: 102
           prob: 0.5
 
 - type: entity
@@ -1669,24 +1673,24 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 30 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Oxygen: 125
-          Frezon: 3
-          WaterVapor: 215
+          Oxygen: 226
+          Frezon: 4
+          WaterVapor: 312
       variableMixture:
         Frezon:
-          moles: 10
+          moles: 14
           prob: 0.2
         Plasma:
-          moles: 110
+          moles: 160
           prob: 0.7
         Oxygen:
-          moles: 110
+          moles: 200
           prob: 0.5
         Tritium:
-          moles: 10
+          moles: 14
           prob: 0.3
         Hydrogen:
-          moles: 90
+          moles: 130
           prob: 0.5
 
 - type: entity
@@ -1891,23 +1895,23 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Nitrogen: 120
-          Ammonia: 60
+          Nitrogen: 218
+          Ammonia: 87
       variableMixture:
         CarbonDioxide:
-          moles: 210
+          moles: 304
           prob: 0.7
         Oxygen:
-          moles: 120
+          moles: 218
           prob: 0.3
         Nitrogen:
-          moles: 120
+          moles: 218
           prob: 0.1
         Chlorine:
-          moles: 50
+          moles: 72
           prob: 0.05
         Fluorine:
-          moles: 30
+          moles: 44
           prob: 0.05
 
 
@@ -1969,20 +1973,20 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Nitrogen: 120
-          Ammonia: 60
+          Nitrogen: 218
+          Ammonia: 87
       variableMixture:
         CarbonDioxide:
-          moles: 200
+          moles: 290
           prob: 0.6
         Nitrogen:
-          moles: 180
+          moles: 326
           prob: 0.1
         Chlorine:
-          moles: 40
+          moles: 58
           prob: 0.05
         Fluorine:
-          moles: 20
+          moles: 29
           prob: 0.05
 
 - type: entity
@@ -2043,25 +2047,25 @@
       staticMixture: # IMPORTANT: Use *Mixture instead of air!!
         temperature: 60 # Yall come up with temperature that makes sense
         moles: # Maximum Moles per TILE, factors such as seed upper/lower bound also apply.
-          Oxygen: 50
-          Nitrogen: 120
-          CarbonDioxide: 100
-          Ammonia: 75
+          Oxygen: 90
+          Nitrogen: 218
+          CarbonDioxide: 145
+          Ammonia: 109
       variableMixture:
         CarbonDioxide:
-          moles: 110
+          moles: 160
           prob: 0.5
         Oxygen:
-          moles: 120
+          moles: 218
           prob: 0.4
         Nitrogen:
-          moles: 180
+          moles: 326
           prob: 0.4
         Chlorine:
-          moles: 60
+          moles: 87
           prob: 0.1
         Fluorine:
-          moles: 40
+          moles: 58
           prob: 0.1
 
 - type: entity
diff --git a/Resources/Prototypes/Faction/PrecursorObjectives/precursorobjectives.yml b/Resources/Prototypes/Faction/PrecursorObjectives/precursorobjectives.yml
index 0c5111928c1..c9069ea3a7d 100644
--- a/Resources/Prototypes/Faction/PrecursorObjectives/precursorobjectives.yml
+++ b/Resources/Prototypes/Faction/PrecursorObjectives/precursorobjectives.yml
@@ -2,6 +2,7 @@
   id: precursorDrunk
   name: Get Very Drunk
   targetStatus: Drunk
+  requiredAmount: 15
 
 - type: precursorObjective
   id: precursorHallucinate
diff --git a/Resources/Prototypes/Faction/PrecursorObjectives/roguelevels.yml b/Resources/Prototypes/Faction/PrecursorObjectives/roguelevels.yml
index 5d7d84e9029..a5d11d2af0a 100644
--- a/Resources/Prototypes/Faction/PrecursorObjectives/roguelevels.yml
+++ b/Resources/Prototypes/Faction/PrecursorObjectives/roguelevels.yml
@@ -1,27 +1,31 @@
 - type: rogueLevel
   id: RogueLevel1
-  name: Civillian
+  name: Civillian (1)
   next: RogueLevel2
 
 - type: rogueLevel
   id: RogueLevel2
-  name: Associate
+  name: Associate (2)
   next: RogueLevel3
   cost: 500
+  itemLevel: 1
 
 - type: rogueLevel
   id: RogueLevel3
-  name: Soldier
+  name: Soldier (3)
   next: RogueLevel4
   cost: 2000
+  itemLevel: 2
 
 - type: rogueLevel
   id: RogueLevel4
-  name: Captain
+  name: Captain (4)
   next: RogueLevel5
   cost: 10000
+  itemLevel: 3
 
 - type: rogueLevel
   id: RogueLevel5
-  name: Boss
+  name: Boss (5)
   cost: 50000
+  itemLevel: 4
diff --git a/Resources/Prototypes/Guidebook/antagonist.yml b/Resources/Prototypes/Guidebook/antagonist.yml
index 66cb65218a9..71f090a7bdb 100644
--- a/Resources/Prototypes/Guidebook/antagonist.yml
+++ b/Resources/Prototypes/Guidebook/antagonist.yml
@@ -1,59 +1,59 @@
-- type: guideEntry
-  id: Antagonists
-  name: guide-entry-antagonists
-  text: "/ServerInfo/Guidebook/Antagonist/Antagonists.xml"
-  children:
-  - Traitors
-  - Thieves
-  - Revolutionaries
-  - NuclearOperatives
-  - SpaceNinja
-  - Wizard
-  - Zombies
-  - Xenoborgs
-  - MinorAntagonists
-
-- type: guideEntry
-  id: Traitors
-  name: guide-entry-traitors
-  text: "/ServerInfo/Guidebook/Antagonist/Traitors.xml"
-
-- type: guideEntry
-  id: NuclearOperatives
-  name: guide-entry-nuclear-operatives
-  text: "/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml"
-
-- type: guideEntry
-  id: Zombies
-  name: guide-entry-zombies
-  text: "/ServerInfo/Guidebook/Antagonist/Zombies.xml"
-
-- type: guideEntry
-  id: Revolutionaries
-  name: guide-entry-revolutionaries
-  text: "/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml"
-
-- type: guideEntry
-  id: MinorAntagonists
-  name: guide-entry-minor-antagonists
-  text: "/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml"
-
-- type: guideEntry
-  id: SpaceNinja
-  name: guide-entry-space-ninja
-  text: "/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml"
-
-- type: guideEntry
-  id: Thieves
-  name: guide-entry-thieves
-  text: "/ServerInfo/Guidebook/Antagonist/Thieves.xml"
-
-- type: guideEntry
-  id: Wizard
-  name: guide-entry-wizard
-  text: "/ServerInfo/Guidebook/Antagonist/Wizard.xml"
-
-- type: guideEntry
-  id: Xenoborgs
-  name: guide-entry-xenoborgs
-  text: "/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml"
+# - type: guideEntry
+#   id: Antagonists
+#   name: guide-entry-antagonists
+#   text: "/ServerInfo/Guidebook/Antagonist/Antagonists.xml"
+#   children:
+#   - Traitors
+#   - Thieves
+#   - Revolutionaries
+#   - NuclearOperatives
+#   - SpaceNinja
+#   - Wizard
+#   - Zombies
+#   - Xenoborgs
+#   - MinorAntagonists
+
+# - type: guideEntry
+#   id: Traitors
+#   name: guide-entry-traitors
+#   text: "/ServerInfo/Guidebook/Antagonist/Traitors.xml"
+
+# - type: guideEntry
+#   id: NuclearOperatives
+#   name: guide-entry-nuclear-operatives
+#   text: "/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml"
+
+# - type: guideEntry
+#   id: Zombies
+#   name: guide-entry-zombies
+#   text: "/ServerInfo/Guidebook/Antagonist/Zombies.xml"
+
+# - type: guideEntry
+#   id: Revolutionaries
+#   name: guide-entry-revolutionaries
+#   text: "/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml"
+
+# - type: guideEntry
+#   id: MinorAntagonists
+#   name: guide-entry-minor-antagonists
+#   text: "/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml"
+
+# - type: guideEntry
+#   id: SpaceNinja
+#   name: guide-entry-space-ninja
+#   text: "/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml"
+
+# - type: guideEntry
+#   id: Thieves
+#   name: guide-entry-thieves
+#   text: "/ServerInfo/Guidebook/Antagonist/Thieves.xml"
+
+# - type: guideEntry
+#   id: Wizard
+#   name: guide-entry-wizard
+#   text: "/ServerInfo/Guidebook/Antagonist/Wizard.xml"
+
+# - type: guideEntry
+#   id: Xenoborgs
+#   name: guide-entry-xenoborgs
+#   text: "/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml"
diff --git a/Resources/Prototypes/Guidebook/factions.yml b/Resources/Prototypes/Guidebook/factions.yml
index 117e6fe23c5..c648b71e20e 100644
--- a/Resources/Prototypes/Guidebook/factions.yml
+++ b/Resources/Prototypes/Guidebook/factions.yml
@@ -70,3 +70,33 @@
   id: AccessControl
   name: Access Control
   text: "/ServerInfo/Guidebook/Persistence/AccessControl.xml"
+
+- type: guideEntry
+  id: Precursor
+  name: Precursor
+  text: "/ServerInfo/Guidebook/Persistence/Precursor.xml"
+  children:
+  - Dealer
+  - BountyHunter
+  - Purchases
+  - SectorChaos
+
+- type: guideEntry
+  id: Dealer
+  name: Dealer
+  text: "/ServerInfo/Guidebook/Persistence/Dealer.xml"
+
+- type: guideEntry
+  id: BountyHunter
+  name: Bounty Hunter & Assassin
+  text: "/ServerInfo/Guidebook/Persistence/Hunter.xml"
+
+- type: guideEntry
+  id: Purchases
+  name: Precursor Purchases
+  text: "/ServerInfo/Guidebook/Persistence/Purchases.xml"
+
+- type: guideEntry
+  id: SectorChaos
+  name: Sector Chaos
+  text: "/ServerInfo/Guidebook/Persistence/SectorChaos.xml"
diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml
index 9783b23285d..c69decaa635 100644
--- a/Resources/Prototypes/Guidebook/species.yml
+++ b/Resources/Prototypes/Guidebook/species.yml
@@ -12,6 +12,7 @@
   - SlimePerson
   - Vox
   - Vulpkanin
+  - Goblin
 
 - type: guideEntry
   id: Arachnid
@@ -57,3 +58,8 @@
   id: Vulpkanin
   name: species-name-vulpkanin
   text: "/ServerInfo/Guidebook/Mobs/Vulpkanin.xml"
+
+- type: guideEntry
+  id: Goblin
+  name: species-name-goblin
+  text: "/ServerInfo/Guidebook/Mobs/Goblin.xml"
diff --git a/Resources/Prototypes/Guidebook/station.yml b/Resources/Prototypes/Guidebook/station.yml
index 4dee5967006..540617ab49b 100644
--- a/Resources/Prototypes/Guidebook/station.yml
+++ b/Resources/Prototypes/Guidebook/station.yml
@@ -6,7 +6,6 @@
   children:
   - Jobs
   - Survival
-  - Antagonists
   - Glossary
 
 - type: guideEntry
diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml
index 1c32732eb3e..c832701182e 100644
--- a/Resources/Prototypes/Hydroponics/randomChemicals.yml
+++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml
@@ -4,26 +4,19 @@
   - quantity: 5
     weight: 0.5
     reagents:
-    - Omnizine
-    - Impedrezene
+    - Impedrezene # drunk, hallucinate
     - HeartbreakerToxin
     - Honk
     - BuzzochloricBees
   - quantity: 5
     weight: 1
     reagents:
-    - Cognizine
     - Toxin
-    - Leporazine
-    - Epinephrine
     - CarpoToxin
     - SulfuricAcid
     - Licoxide
     - Napalm
     - ChlorineTrifluoride
-    - Radium
-    - Gold
-    - Uranium
     - Phosphorus
     - AtomicBomb
     - Neurotoxin
@@ -36,42 +29,25 @@
   - quantity: 5
     weight: 2
     reagents:
-    - Desoxyephedrine
     - ChloralHydrate
     - Ipecac
-    - Hyronalin
     - Pax
-    - Cryoxadone
-    - Ethylredoxrazine
-    - Dylovene
     - Histamine
     - Blood
-    - WeldingFuel
     - Mercury
-    - Silver
     - Phenol
-    - Ultravasculine
     - Carbon
     - THC
     - Nicotine
-    - DoctorsDelight
     - IceCream
     - Cola
-    - Diphenhydramine
-    - Iron
     - Bleach
-    - Mannitol
   - quantity: 10
     weight: 3
     reagents:
-    - Bicaridine
-    - Dermaline
-    - Ephedrine
     - NorepinephricAcid
-    - Tricordrazine
     - Saline
-    - PulpedBananaPeel
-    - Cryptobiolin
+    - Cryptobiolin # woozy
     - EZNutrient
     - Ammonia
     - RobustHarvest
@@ -82,7 +58,6 @@
     - Ash
     - SodiumCarbonate
     - SpaceDrugs
-    - SpaceGlue
     - JuiceBerryPoison
     - Pilk
     - Posca
@@ -94,7 +69,6 @@
     - Vinegar
     - Potassium
     - Fluorine
-    - Aluminium
     - Wine
     - Coffee
     - Beer
@@ -102,8 +76,6 @@
     weight: 3.5
     reagents:
     - Vitamin
-    - Kelotane
-    - Inaprovaline
     - Oil
     - Slime
     - Fiber
@@ -120,6 +92,7 @@
     - TableSalt
     - Chlorine
     - Mercury
+    - Lithium
 
 - type: weightedRandomFillSolution
   id: EvilRandomFillSolution
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 68f43a2f303..4db77829580 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -478,8 +478,6 @@
   packetPrototype: TowercapSeeds
   productPrototypes:
     - Log
-  mutationPrototypes:
-    - steelcap
   lifespan: 80
   maturation: 15
   ligneous: true
@@ -504,8 +502,8 @@
   lifespan: 80
   maturation: 15
   ligneous: true
-  production: 3
-  yield: 3
+  production: 1
+  yield: 1
   potency: 1
   growthStages: 3
   waterConsumption: 0.60
@@ -742,8 +740,8 @@
   packetPrototype: AppleSeeds
   productPrototypes:
     - FoodApple
-  mutationPrototypes:
-    - goldenApple
+  # mutationPrototypes:
+  #   - goldenApple
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6
@@ -999,7 +997,7 @@
     Happiness:
       Min: 1
       Max: 5
-#     PotencyDivisor: 20
+      PotencyDivisor: 20
 #   ColorfulReagent:
 #     Min: 0
 #     Max: 5
@@ -1272,8 +1270,6 @@
   packetPrototype: AmbrosiaVulgarisSeeds
   productPrototypes:
     - FoodAmbrosiaVulgaris
-  mutationPrototypes:
-    - ambrosiaDeus
   lifespan: 25
   maturation: 10
   production: 3
@@ -1307,7 +1303,7 @@
   plantRsi: Objects/Specific/Hydroponics/ambrosia_deus.rsi
   packetPrototype: AmbrosiaDeusSeeds
   productPrototypes:
-    - FoodAmbrosiaDeus
+    - FoodAmbrosiaVulgaris
   lifespan: 25
   maturation: 10
   production: 3
@@ -1338,8 +1334,6 @@
   packetPrototype: GalaxythistleSeeds
   productPrototypes:
     - FoodGalaxythistle
-  mutationPrototypes:
-    - glasstle
   lifespan: 25
   maturation: 10
   production: 3
@@ -1365,7 +1359,7 @@
   lifespan: 25
   maturation: 10
   production: 3
-  yield: 3
+  yield: 1
   potency: 10
   growthStages: 3
   waterConsumption: 0.5
@@ -1415,9 +1409,9 @@
   packetPrototype: GatfruitSeeds
   productPrototypes:
     - FoodGatfruit
-  mutationPrototypes:
-    - fakeCapfruit
-    - realCapfruit
+  # mutationPrototypes:
+  #   - fakeCapfruit
+  #   - realCapfruit
   lifespan: 65
   maturation: 25
   production: 25
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 23d359ec84f..eaa219f4778 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -616,6 +616,22 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: Barefoot
@@ -806,6 +822,20 @@
     Digestion:
       metabolites:
         Ethanol: 0.14
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
   fizziness: 0.2
 
 - type: reagent
@@ -1041,6 +1071,22 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: HippiesDelight
@@ -1183,6 +1229,22 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: LongIslandIcedTea
@@ -1314,6 +1376,22 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   fizziness: 0.3
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: MonkeyBusiness
@@ -1450,6 +1528,20 @@
     Digestion:
       metabolites:
         Ethanol: 0.4
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: Radler
@@ -1542,6 +1634,19 @@
   metabolisms:
     Digestion:
       effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
       - !type:GenericStatusEffect
         key: Muted
         component: Muted
@@ -1610,6 +1715,22 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   fizziness: 0.6
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: TequilaSunrise
@@ -1645,6 +1766,22 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   fizziness: 0.2
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: ThreeMileIsland
@@ -1753,6 +1890,20 @@
     Digestion:
       metabolites:
         Ethanol: 0.14
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
   fizziness: 0.3
 
 - type: reagent
@@ -1968,12 +2119,25 @@
         Ethanol: 0.3
         Theobromine: 0.1
       effects:
-        - !type:SatiateThirst
-          factor: 1
-        - !type:ModifyStatusEffect
-          effectProto: StatusEffectDrowsiness
-          time: 1
-          type: Remove
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
+      - !type:SatiateThirst
+        factor: 1
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectDrowsiness
+        time: 1
+        type: Remove
   fizziness: 0.25
 
 - type: reagent
@@ -2013,6 +2177,20 @@
     Digestion:
       metabolites:
         Ethanol: 0.2
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: MoscowMule
@@ -2185,6 +2363,20 @@
     Digestion:
       metabolites:
         Ethanol: 0.2
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: TheSunAlsoRises
@@ -2223,6 +2415,20 @@
     Digestion:
       metabolites:
         Ethanol: 0.4
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: ZombieCocktail
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 772a145851c..738be26e097 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -78,6 +78,19 @@
   metabolisms:
     Digestion:
       effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
       - !type:SatiateThirst
         factor: 2
 
@@ -234,6 +247,19 @@
   metabolisms:
     Digestion:
       effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
       - !type:SatiateThirst
         factor: 2
 
@@ -342,6 +368,19 @@
         damage:
           types:
             Poison: 1
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
   fizziness: 0.5
 
 - type: reagent
@@ -536,6 +575,19 @@
       effects:
         - !type:SatiateThirst
           factor: 1
+        - !type:PopupMessage
+          conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin] # Doom approaches
+          type: Local
+          visualType: MediumCaution
+          messages: [ "generic-reagent-effect-sick" ]
+          probability: 0.5
+        - !type:Vomit
+          probability: 0.5
+          conditions:
+            - !type:MetabolizerTypeCondition
+              type: [Goblin]  # Goblins vomit when eating sugar
   fizziness: 0.3
 
 - type: reagent
@@ -607,3 +659,19 @@
   metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 73bff27e67c..71e4c2f112c 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -16,6 +16,19 @@
   metabolisms:
     Digestion:
       effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
       - !type:SatiateThirst
         factor: 2
       - !type:ModifyStatusEffect
@@ -40,6 +53,19 @@
   metabolisms:
     Digestion:
       effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
       - !type:SatiateThirst
         factor: 4
 
@@ -113,6 +139,22 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   fizziness: 0
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: LemonLime
@@ -246,6 +288,22 @@
   physicalDesc: reagent-physical-desc-fizzy
   flavor: starkistsoda
   color: "#9F3400"
+  metabolisms:
+    Digestion:
+      effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
 
 - type: reagent
   id: FourteenLoko
@@ -266,6 +324,19 @@
       metabolites:
         Theobromine: 0.2
       effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:Vomit
+        probability: 0.5
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
       - !type:SatiateThirst
         factor: 2
       - !type:HealthChange
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
index cb43938adf8..f0ddefce5b0 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
@@ -78,6 +78,19 @@
   metabolisms:
     Metabolites:
       effects:
+      - !type:PopupMessage
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Goblin] # Doom approaches
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 1
+      - !type:Vomit
+        probability: 1
+        conditions:
+          - !type:MetabolizerTypeCondition
+            type: [Goblin]  # Goblins vomit when eating sugar
       - !type:SatiateHunger
         conditions:
         - !type:ReagentCondition #Only satiates when eaten with nutriment
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index b90d36c014d..5d93016c083 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -16,7 +16,7 @@
       - !type:Oxygenate
         conditions:
         - !type:MetabolizerTypeCondition
-          type: [ Human, Animal, Rat, Plant ]
+          type: [ Human, Animal, Rat, Plant, Goblin ]
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
         conditions:
@@ -47,7 +47,7 @@
       - !type:Oxygenate
         conditions:
         - !type:MetabolizerTypeCondition
-          type: [ Human, Animal, Rat, Plant, Arachnid, Moth ]
+          type: [ Human, Animal, Rat, Plant, Arachnid, Moth, Goblin ]
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
         conditions:
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 98930f0a937..6f59fda9ad6 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -553,7 +553,7 @@
       - !type:PopupMessage
         conditions:
         - !type:MetabolizerTypeCondition
-          type: [ Animal, Vox ]
+          type: [ Animal, Vox, Goblin ]
           inverted: true
         type: Local
         visualType: MediumCaution
@@ -563,12 +563,12 @@
         probability: 0.1
         conditions:
         - !type:MetabolizerTypeCondition
-          type: [ Animal, Vox, Plant ]
+          type: [ Animal, Vox, Plant, Goblin ]
           inverted: true
       - !type:HealthChange
         conditions:
         - !type:MetabolizerTypeCondition
-          type: [ Animal, Vox, Plant ]
+          type: [ Animal, Vox, Plant, Goblin ]
           inverted: true
         damage:
           types:
@@ -586,6 +586,12 @@
           type: [ Animal ]
         reagent: Protein
         amount: 0.5
+      - !type:AdjustReagent
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [ Goblin ]
+        reagent: Protein
+        amount: 0.5
       - !type:AdjustReagent
         conditions:
         - !type:MetabolizerTypeCondition
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml b/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml
index 312486cc7d1..b0e16682cd0 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml
@@ -6,6 +6,7 @@
   - AppraisalTool
   - Pickaxe
   - UtilityKnife
+  - CargoTelepadMachineCircuitboard
 
 - type: latheRecipePack
   id: CargoBoardsStatic
@@ -16,7 +17,6 @@
   - CargoBountyComputerCircuitboard
   - SalvageJobBoardComputerCircuitboard
   - RadarConsoleCircuitboard
-
 ## Dynamic
 
 - type: latheRecipePack
@@ -33,5 +33,4 @@
   id: CargoBoards
   recipes:
   - OreProcessorIndustrialMachineCircuitboard
-  - CargoTelepadMachineCircuitboard
   - ShuttleGunKineticCircuitboard
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
index 0722b36f1eb..1706c161cfb 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
@@ -28,6 +28,7 @@
   - WetFloorSign
   - WireBrush
   - BSPAnchorKey
+  - PrecursorExtractor
   - KitchenKnife
   - RollingPin
   - BarberScissors
diff --git a/Resources/Prototypes/Recipes/Lathes/machine_boards.yml b/Resources/Prototypes/Recipes/Lathes/machine_boards.yml
index bcd9e6fb295..919c98a3c15 100644
--- a/Resources/Prototypes/Recipes/Lathes/machine_boards.yml
+++ b/Resources/Prototypes/Recipes/Lathes/machine_boards.yml
@@ -372,7 +372,6 @@
   parent: [ BaseGoldCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
   id: CargoTelepadMachineCircuitboard
   result: CargoTelepadMachineCircuitboard
-  unlockUses: 2
 
 - type: latheRecipe
   parent: [ BaseGoldCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index f080067be10..608737690c3 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -202,6 +202,14 @@
     Steel: 300
     Plastic: 100
 
+- type: latheRecipe
+  id: PrecursorExtractor
+  result: PrecursorExtractor
+  completetime: 2
+  materials:
+    Steel: 300
+    Glass: 200
+
 - type: latheRecipe
   id: BSPAnchorKey
   result: BSPAnchorKey
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index ab2d3bf4eae..0b4cf91de24 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -210,18 +210,6 @@
   - WeaponSprayNozzle
   - ClothingBackpackWaterTank
 
-- type: technology
-  id: BluespaceCargoTransport
-  name: research-technology-bluespace-cargo-transport
-  icon:
-    sprite: Structures/cargo_telepad.rsi
-    state: display
-  discipline: CivilianServices
-  tier: 2
-  cost: 15000
-  recipeUnlocks:
-  - CargoTelepadMachineCircuitboard
-
 - type: technology
   id: PushHorn
   name: research-technology-clowning-utilities
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
index 2d6788038ae..7f72c9e68db 100644
--- a/Resources/Prototypes/SoundCollections/lobby.yml
+++ b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -1,6 +1,6 @@
 - type: soundCollection
   id: LobbyMusic
   files:
-    - /Audio/Lobby/ambient-space-arpeggio.ogg
+    - /Audio/Lobby/Welcome_To_The_Threshold.ogg
 
 
diff --git a/Resources/Prototypes/Species/goblin.yml b/Resources/Prototypes/Species/goblin.yml
new file mode 100644
index 00000000000..678e5e8dcb6
--- /dev/null
+++ b/Resources/Prototypes/Species/goblin.yml
@@ -0,0 +1,11 @@
+- type: species
+  id: Goblin
+  name: species-name-goblin
+  roundStart: true
+  prototype: MobGoblin
+  defaultSkinTone: "#486a1b"
+  dollPrototype: AppearanceGoblin
+  skinColoration: HumanToned
+  maleFirstNames: names_goblin_male
+  femaleFirstNames: names_goblin_female
+  lastNames: names_goblin_last
diff --git a/Resources/Prototypes/_NF/Accents/word_replacements.yml b/Resources/Prototypes/_NF/Accents/word_replacements.yml
new file mode 100644
index 00000000000..ef140c2ee26
--- /dev/null
+++ b/Resources/Prototypes/_NF/Accents/word_replacements.yml
@@ -0,0 +1,369 @@
+- type: accent
+  id: goblin_accent
+  wordReplacements:
+    accent-goblin-words-1: accent-goblin-words-replace-1
+    accent-goblin-words-2: accent-goblin-words-replace-2
+    accent-goblin-words-3: accent-goblin-words-replace-3
+    accent-goblin-words-4: accent-goblin-words-replace-4
+    accent-goblin-words-5: accent-goblin-words-replace-5
+    accent-goblin-words-6: accent-goblin-words-replace-6
+    accent-goblin-words-7: accent-goblin-words-replace-7
+    accent-goblin-words-8: accent-goblin-words-replace-8
+    accent-goblin-words-9: accent-goblin-words-replace-9
+    accent-goblin-words-10: accent-goblin-words-replace-10
+    accent-goblin-words-11: accent-goblin-words-replace-11
+    accent-goblin-words-12: accent-goblin-words-replace-12
+    accent-goblin-words-13: accent-goblin-words-replace-13
+    accent-goblin-words-14: accent-goblin-words-replace-14
+    accent-goblin-words-15: accent-goblin-words-replace-15
+    accent-goblin-words-16: accent-goblin-words-replace-16
+    accent-goblin-words-17: accent-goblin-words-replace-17
+    accent-goblin-words-18: accent-goblin-words-replace-18
+    accent-goblin-words-19: accent-goblin-words-replace-19
+    accent-goblin-words-20: accent-goblin-words-replace-20
+    accent-goblin-words-21: accent-goblin-words-replace-21
+    accent-goblin-words-22: accent-goblin-words-replace-22
+    accent-goblin-words-23: accent-goblin-words-replace-23
+    accent-goblin-words-24: accent-goblin-words-replace-24
+    accent-goblin-words-25: accent-goblin-words-replace-25
+    accent-goblin-words-26: accent-goblin-words-replace-26
+    accent-goblin-words-27: accent-goblin-words-replace-27
+    accent-goblin-words-28: accent-goblin-words-replace-28
+    accent-goblin-words-29: accent-goblin-words-replace-29
+    accent-goblin-words-30: accent-goblin-words-replace-30
+    accent-goblin-words-31: accent-goblin-words-replace-31
+    accent-goblin-words-32: accent-goblin-words-replace-32
+    accent-goblin-words-33: accent-goblin-words-replace-33
+    accent-goblin-words-34: accent-goblin-words-replace-34
+    accent-goblin-words-35: accent-goblin-words-replace-35
+    accent-goblin-words-36: accent-goblin-words-replace-36
+    accent-goblin-words-37: accent-goblin-words-replace-37
+    accent-goblin-words-38: accent-goblin-words-replace-38
+    accent-goblin-words-39: accent-goblin-words-replace-39
+    accent-goblin-words-40: accent-goblin-words-replace-40
+    accent-goblin-words-41: accent-goblin-words-replace-41
+    accent-goblin-words-42: accent-goblin-words-replace-42
+    accent-goblin-words-43: accent-goblin-words-replace-43
+    accent-goblin-words-44: accent-goblin-words-replace-44
+    accent-goblin-words-45: accent-goblin-words-replace-45
+    accent-goblin-words-46: accent-goblin-words-replace-46
+    accent-goblin-words-47: accent-goblin-words-replace-47
+    accent-goblin-words-48: accent-goblin-words-replace-48
+    accent-goblin-words-49: accent-goblin-words-replace-49
+    accent-goblin-words-50: accent-goblin-words-replace-50
+    accent-goblin-words-51: accent-goblin-words-replace-51
+    accent-goblin-words-52: accent-goblin-words-replace-52
+    accent-goblin-words-53: accent-goblin-words-replace-53
+    accent-goblin-words-54: accent-goblin-words-replace-54
+    accent-goblin-words-55: accent-goblin-words-replace-55
+    accent-goblin-words-56: accent-goblin-words-replace-56
+    accent-goblin-words-57: accent-goblin-words-replace-57
+    accent-goblin-words-58: accent-goblin-words-replace-58
+    accent-goblin-words-59: accent-goblin-words-replace-59
+    accent-goblin-words-60: accent-goblin-words-replace-60
+    accent-goblin-words-61: accent-goblin-words-replace-61
+    accent-goblin-words-62: accent-goblin-words-replace-62
+    accent-goblin-words-63: accent-goblin-words-replace-63
+    accent-goblin-words-64: accent-goblin-words-replace-64
+    accent-goblin-words-65: accent-goblin-words-replace-65
+    accent-goblin-words-66: accent-goblin-words-replace-66
+    accent-goblin-words-67: accent-goblin-words-replace-67
+    accent-goblin-words-68: accent-goblin-words-replace-68
+    accent-goblin-words-69: accent-goblin-words-replace-69
+    accent-goblin-words-70: accent-goblin-words-replace-70
+    accent-goblin-words-71: accent-goblin-words-replace-71
+    accent-goblin-words-72: accent-goblin-words-replace-72
+    accent-goblin-words-73: accent-goblin-words-replace-73
+    accent-goblin-words-74: accent-goblin-words-replace-74
+    accent-goblin-words-75: accent-goblin-words-replace-75
+    accent-goblin-words-76: accent-goblin-words-replace-76
+    accent-goblin-words-77: accent-goblin-words-replace-77
+    accent-goblin-words-78: accent-goblin-words-replace-78
+    accent-goblin-words-79: accent-goblin-words-replace-79
+    accent-goblin-words-80: accent-goblin-words-replace-80
+    accent-goblin-words-81: accent-goblin-words-replace-81
+    accent-goblin-words-82: accent-goblin-words-replace-82
+    accent-goblin-words-83: accent-goblin-words-replace-83
+    accent-goblin-words-84: accent-goblin-words-replace-84
+    accent-goblin-words-85: accent-goblin-words-replace-85
+    accent-goblin-words-86: accent-goblin-words-replace-86
+    accent-goblin-words-87: accent-goblin-words-replace-87
+    accent-goblin-words-88: accent-goblin-words-replace-88
+    accent-goblin-words-89: accent-goblin-words-replace-89
+    accent-goblin-words-90: accent-goblin-words-replace-90
+    accent-goblin-words-91: accent-goblin-words-replace-91
+    accent-goblin-words-92: accent-goblin-words-replace-92
+    accent-goblin-words-93: accent-goblin-words-replace-93
+    accent-goblin-words-94: accent-goblin-words-replace-94
+    accent-goblin-words-95: accent-goblin-words-replace-95
+    accent-goblin-words-96: accent-goblin-words-replace-96
+    accent-goblin-words-97: accent-goblin-words-replace-97
+    accent-goblin-words-98: accent-goblin-words-replace-98
+    accent-goblin-words-99: accent-goblin-words-replace-99
+    accent-goblin-words-100: accent-goblin-words-replace-100
+    accent-goblin-words-101: accent-goblin-words-replace-101
+    accent-goblin-words-102: accent-goblin-words-replace-102
+    accent-goblin-words-103: accent-goblin-words-replace-103
+    accent-goblin-words-104: accent-goblin-words-replace-104
+    accent-goblin-words-105: accent-goblin-words-replace-105
+    accent-goblin-words-106: accent-goblin-words-replace-106
+    accent-goblin-words-107: accent-goblin-words-replace-107
+    accent-goblin-words-108: accent-goblin-words-replace-108
+    accent-goblin-words-109: accent-goblin-words-replace-109
+    accent-goblin-words-110: accent-goblin-words-replace-110
+    accent-goblin-words-111: accent-goblin-words-replace-111
+    accent-goblin-words-112: accent-goblin-words-replace-112
+    accent-goblin-words-113: accent-goblin-words-replace-113
+    accent-goblin-words-114: accent-goblin-words-replace-114
+    accent-goblin-words-115: accent-goblin-words-replace-115
+    accent-goblin-words-116: accent-goblin-words-replace-116
+    accent-goblin-words-117: accent-goblin-words-replace-117
+    accent-goblin-words-118: accent-goblin-words-replace-118
+    accent-goblin-words-119: accent-goblin-words-replace-119
+    accent-goblin-words-120: accent-goblin-words-replace-120
+    accent-goblin-words-121: accent-goblin-words-replace-121
+    accent-goblin-words-122: accent-goblin-words-replace-122
+    accent-goblin-words-123: accent-goblin-words-replace-123
+    accent-goblin-words-124: accent-goblin-words-replace-124
+    accent-goblin-words-125: accent-goblin-words-replace-125
+    accent-goblin-words-126: accent-goblin-words-replace-126
+    accent-goblin-words-127: accent-goblin-words-replace-127
+    accent-goblin-words-128: accent-goblin-words-replace-128
+    accent-goblin-words-129: accent-goblin-words-replace-129
+    accent-goblin-words-130: accent-goblin-words-replace-130
+    accent-goblin-words-131: accent-goblin-words-replace-131
+    accent-goblin-words-132: accent-goblin-words-replace-132
+    accent-goblin-words-133: accent-goblin-words-replace-133
+    accent-goblin-words-134: accent-goblin-words-replace-134
+    accent-goblin-words-135: accent-goblin-words-replace-135
+    accent-goblin-words-136: accent-goblin-words-replace-136
+    accent-goblin-words-137: accent-goblin-words-replace-137
+    accent-goblin-words-138: accent-goblin-words-replace-138
+    accent-goblin-words-139: accent-goblin-words-replace-139
+    accent-goblin-words-140: accent-goblin-words-replace-140
+    accent-goblin-words-141: accent-goblin-words-replace-141
+    accent-goblin-words-142: accent-goblin-words-replace-142
+    accent-goblin-words-143: accent-goblin-words-replace-143
+    accent-goblin-words-144: accent-goblin-words-replace-144
+    accent-goblin-words-145: accent-goblin-words-replace-145
+    accent-goblin-words-146: accent-goblin-words-replace-146
+    accent-goblin-words-147: accent-goblin-words-replace-147
+    accent-goblin-words-148: accent-goblin-words-replace-148
+    accent-goblin-words-149: accent-goblin-words-replace-149
+    accent-goblin-words-150: accent-goblin-words-replace-150
+    accent-goblin-words-151: accent-goblin-words-replace-151
+    accent-goblin-words-152: accent-goblin-words-replace-152
+    accent-goblin-words-153: accent-goblin-words-replace-153
+    accent-goblin-words-154: accent-goblin-words-replace-154
+    accent-goblin-words-155: accent-goblin-words-replace-155
+    accent-goblin-words-156: accent-goblin-words-replace-156
+    accent-goblin-words-157: accent-goblin-words-replace-157
+    accent-goblin-words-158: accent-goblin-words-replace-158
+    accent-goblin-words-159: accent-goblin-words-replace-159
+    accent-goblin-words-160: accent-goblin-words-replace-160
+    accent-goblin-words-161: accent-goblin-words-replace-161
+    accent-goblin-words-162: accent-goblin-words-replace-162
+    accent-goblin-words-163: accent-goblin-words-replace-163
+    accent-goblin-words-164: accent-goblin-words-replace-164
+    accent-goblin-words-165: accent-goblin-words-replace-165
+    accent-goblin-words-166: accent-goblin-words-replace-166
+    accent-goblin-words-167: accent-goblin-words-replace-167
+    accent-goblin-words-168: accent-goblin-words-replace-168
+    accent-goblin-words-169: accent-goblin-words-replace-169
+    accent-goblin-words-170: accent-goblin-words-replace-170
+    accent-goblin-words-171: accent-goblin-words-replace-171
+    accent-goblin-words-172: accent-goblin-words-replace-172
+    accent-goblin-words-173: accent-goblin-words-replace-173
+    accent-goblin-words-174: accent-goblin-words-replace-174
+    accent-goblin-words-175: accent-goblin-words-replace-175
+    accent-goblin-words-176: accent-goblin-words-replace-176
+    accent-goblin-words-177: accent-goblin-words-replace-177
+    accent-goblin-words-178: accent-goblin-words-replace-178
+    accent-goblin-words-179: accent-goblin-words-replace-179
+    accent-goblin-words-180: accent-goblin-words-replace-180
+    accent-goblin-words-181: accent-goblin-words-replace-181
+    accent-goblin-words-182: accent-goblin-words-replace-182
+    accent-goblin-words-183: accent-goblin-words-replace-183
+    accent-goblin-words-184: accent-goblin-words-replace-184
+    accent-goblin-words-185: accent-goblin-words-replace-185
+    accent-goblin-words-186: accent-goblin-words-replace-186
+    accent-goblin-words-187: accent-goblin-words-replace-187
+    accent-goblin-words-188: accent-goblin-words-replace-188
+    accent-goblin-words-189: accent-goblin-words-replace-189
+    accent-goblin-words-190: accent-goblin-words-replace-190
+    accent-goblin-words-191: accent-goblin-words-replace-191
+    accent-goblin-words-192: accent-goblin-words-replace-192
+    accent-goblin-words-193: accent-goblin-words-replace-193
+    accent-goblin-words-194: accent-goblin-words-replace-194
+    accent-goblin-words-195: accent-goblin-words-replace-195
+    accent-goblin-words-196: accent-goblin-words-replace-196
+    accent-goblin-words-197: accent-goblin-words-replace-197
+    accent-goblin-words-198: accent-goblin-words-replace-198
+    accent-goblin-words-199: accent-goblin-words-replace-199
+    accent-goblin-words-200: accent-goblin-words-replace-200
+    accent-goblin-words-201: accent-goblin-words-replace-201
+    accent-goblin-words-202: accent-goblin-words-replace-202
+    accent-goblin-words-203: accent-goblin-words-replace-203
+    accent-goblin-words-204: accent-goblin-words-replace-204
+    accent-goblin-words-205: accent-goblin-words-replace-205
+    accent-goblin-words-206: accent-goblin-words-replace-206
+    accent-goblin-words-207: accent-goblin-words-replace-207
+    accent-goblin-words-208: accent-goblin-words-replace-208
+    accent-goblin-words-209: accent-goblin-words-replace-209
+    accent-goblin-words-210: accent-goblin-words-replace-210
+    accent-goblin-words-211: accent-goblin-words-replace-211
+    accent-goblin-words-212: accent-goblin-words-replace-212
+    accent-goblin-words-213: accent-goblin-words-replace-213
+    accent-goblin-words-214: accent-goblin-words-replace-214
+    accent-goblin-words-215: accent-goblin-words-replace-215
+    accent-goblin-words-216: accent-goblin-words-replace-216
+    accent-goblin-words-217: accent-goblin-words-replace-217
+    accent-goblin-words-218: accent-goblin-words-replace-218
+    accent-goblin-words-219: accent-goblin-words-replace-219
+    accent-goblin-words-220: accent-goblin-words-replace-220
+    accent-goblin-words-221: accent-goblin-words-replace-221
+    accent-goblin-words-222: accent-goblin-words-replace-222
+    accent-goblin-words-223: accent-goblin-words-replace-223
+    accent-goblin-words-224: accent-goblin-words-replace-224
+    accent-goblin-words-225: accent-goblin-words-replace-225
+    accent-goblin-words-226: accent-goblin-words-replace-226
+    accent-goblin-words-227: accent-goblin-words-replace-227
+    accent-goblin-words-228: accent-goblin-words-replace-228
+    accent-goblin-words-229: accent-goblin-words-replace-229
+    accent-goblin-words-230: accent-goblin-words-replace-230
+    accent-goblin-words-231: accent-goblin-words-replace-231
+    accent-goblin-words-232: accent-goblin-words-replace-232
+    accent-goblin-words-233: accent-goblin-words-replace-233
+    accent-goblin-words-234: accent-goblin-words-replace-234
+    accent-goblin-words-235: accent-goblin-words-replace-235
+    accent-goblin-words-236: accent-goblin-words-replace-236
+    accent-goblin-words-237: accent-goblin-words-replace-237
+    accent-goblin-words-238: accent-goblin-words-replace-238
+    accent-goblin-words-239: accent-goblin-words-replace-239
+    accent-goblin-words-240: accent-goblin-words-replace-240
+    accent-goblin-words-241: accent-goblin-words-replace-241
+    accent-goblin-words-242: accent-goblin-words-replace-242
+    accent-goblin-words-243: accent-goblin-words-replace-243
+    accent-goblin-words-244: accent-goblin-words-replace-244
+    accent-goblin-words-245: accent-goblin-words-replace-245
+    accent-goblin-words-246: accent-goblin-words-replace-246
+    accent-goblin-words-247: accent-goblin-words-replace-247
+    accent-goblin-words-248: accent-goblin-words-replace-248
+    accent-goblin-words-249: accent-goblin-words-replace-249
+    accent-goblin-words-250: accent-goblin-words-replace-250
+    accent-goblin-words-251: accent-goblin-words-replace-251
+    accent-goblin-words-252: accent-goblin-words-replace-252
+    accent-goblin-words-253: accent-goblin-words-replace-253
+    accent-goblin-words-254: accent-goblin-words-replace-254
+    accent-goblin-words-255: accent-goblin-words-replace-255
+    accent-goblin-words-256: accent-goblin-words-replace-256
+    accent-goblin-words-257: accent-goblin-words-replace-257
+    accent-goblin-words-258: accent-goblin-words-replace-258
+    accent-goblin-words-259: accent-goblin-words-replace-259
+    accent-goblin-words-260: accent-goblin-words-replace-260
+    accent-goblin-words-261: accent-goblin-words-replace-261
+    accent-goblin-words-262: accent-goblin-words-replace-262
+    accent-goblin-words-263: accent-goblin-words-replace-263
+    accent-goblin-words-264: accent-goblin-words-replace-264
+    accent-goblin-words-265: accent-goblin-words-replace-265
+    accent-goblin-words-266: accent-goblin-words-replace-266
+    accent-goblin-words-267: accent-goblin-words-replace-267
+    accent-goblin-words-268: accent-goblin-words-replace-268
+    accent-goblin-words-269: accent-goblin-words-replace-269
+    accent-goblin-words-270: accent-goblin-words-replace-270
+    accent-goblin-words-271: accent-goblin-words-replace-271
+    accent-goblin-words-272: accent-goblin-words-replace-272
+    accent-goblin-words-273: accent-goblin-words-replace-273
+    accent-goblin-words-274: accent-goblin-words-replace-274
+    accent-goblin-words-275: accent-goblin-words-replace-275
+    accent-goblin-words-276: accent-goblin-words-replace-276
+    accent-goblin-words-277: accent-goblin-words-replace-277
+    accent-goblin-words-278: accent-goblin-words-replace-278
+    accent-goblin-words-279: accent-goblin-words-replace-279
+    accent-goblin-words-280: accent-goblin-words-replace-280
+    accent-goblin-words-281: accent-goblin-words-replace-281
+    accent-goblin-words-282: accent-goblin-words-replace-282
+    accent-goblin-words-283: accent-goblin-words-replace-283
+    accent-goblin-words-284: accent-goblin-words-replace-284
+    accent-goblin-words-285: accent-goblin-words-replace-285
+    accent-goblin-words-286: accent-goblin-words-replace-286
+    accent-goblin-words-287: accent-goblin-words-replace-287
+    accent-goblin-words-288: accent-goblin-words-replace-288
+    accent-goblin-words-289: accent-goblin-words-replace-289
+    accent-goblin-words-290: accent-goblin-words-replace-290
+    accent-goblin-words-291: accent-goblin-words-replace-291
+    accent-goblin-words-292: accent-goblin-words-replace-292
+    accent-goblin-words-293: accent-goblin-words-replace-293
+    accent-goblin-words-294: accent-goblin-words-replace-294
+    accent-goblin-words-295: accent-goblin-words-replace-295
+    accent-goblin-words-296: accent-goblin-words-replace-296
+    accent-goblin-words-297: accent-goblin-words-replace-297
+    accent-goblin-words-298: accent-goblin-words-replace-298
+    accent-goblin-words-299: accent-goblin-words-replace-299
+    accent-goblin-words-300: accent-goblin-words-replace-300
+    accent-goblin-words-301: accent-goblin-words-replace-301
+    accent-goblin-words-302: accent-goblin-words-replace-302
+    accent-goblin-words-303: accent-goblin-words-replace-303
+    accent-goblin-words-304: accent-goblin-words-replace-304
+    accent-goblin-words-305: accent-goblin-words-replace-305
+    accent-goblin-words-306: accent-goblin-words-replace-306
+    accent-goblin-words-307: accent-goblin-words-replace-307
+    accent-goblin-words-308: accent-goblin-words-replace-308
+    accent-goblin-words-309: accent-goblin-words-replace-309
+    accent-goblin-words-310: accent-goblin-words-replace-310
+    accent-goblin-words-311: accent-goblin-words-replace-311
+    accent-goblin-words-312: accent-goblin-words-replace-312
+    accent-goblin-words-313: accent-goblin-words-replace-313
+    accent-goblin-words-314: accent-goblin-words-replace-314
+    accent-goblin-words-315: accent-goblin-words-replace-315
+    accent-goblin-words-316: accent-goblin-words-replace-316
+    accent-goblin-words-317: accent-goblin-words-replace-317
+    accent-goblin-words-318: accent-goblin-words-replace-318
+    accent-goblin-words-319: accent-goblin-words-replace-319
+    accent-goblin-words-320: accent-goblin-words-replace-320
+    accent-goblin-words-321: accent-goblin-words-replace-321
+    accent-goblin-words-322: accent-goblin-words-replace-322
+    accent-goblin-words-323: accent-goblin-words-replace-323
+    accent-goblin-words-324: accent-goblin-words-replace-324
+    accent-goblin-words-325: accent-goblin-words-replace-325
+    accent-goblin-words-326: accent-goblin-words-replace-326
+    accent-goblin-words-327: accent-goblin-words-replace-327
+    accent-goblin-words-328: accent-goblin-words-replace-328
+    accent-goblin-words-329: accent-goblin-words-replace-329
+    accent-goblin-words-330: accent-goblin-words-replace-330
+    accent-goblin-words-331: accent-goblin-words-replace-331
+    accent-goblin-words-332: accent-goblin-words-replace-332
+    accent-goblin-words-333: accent-goblin-words-replace-333
+    accent-goblin-words-334: accent-goblin-words-replace-334
+    accent-goblin-words-335: accent-goblin-words-replace-335
+    accent-goblin-words-336: accent-goblin-words-replace-336
+    accent-goblin-words-337: accent-goblin-words-replace-337
+    accent-goblin-words-338: accent-goblin-words-replace-338
+    accent-goblin-words-339: accent-goblin-words-replace-339
+    accent-goblin-words-340: accent-goblin-words-replace-340
+    accent-goblin-words-341: accent-goblin-words-replace-341
+    accent-goblin-words-342: accent-goblin-words-replace-342
+    accent-goblin-words-343: accent-goblin-words-replace-343
+    accent-goblin-words-344: accent-goblin-words-replace-344
+    accent-goblin-words-345: accent-goblin-words-replace-345
+    accent-goblin-words-346: accent-goblin-words-replace-346
+    accent-goblin-words-347: accent-goblin-words-replace-347
+    accent-goblin-words-348: accent-goblin-words-replace-348
+    accent-goblin-words-349: accent-goblin-words-replace-349
+    accent-goblin-words-350: accent-goblin-words-replace-350
+    accent-goblin-words-351: accent-goblin-words-replace-351
+    accent-goblin-words-352: accent-goblin-words-replace-352
+    accent-goblin-words-353: accent-goblin-words-replace-353
+    accent-goblin-words-354: accent-goblin-words-replace-354
+    accent-goblin-words-355: accent-goblin-words-replace-355
+    accent-goblin-words-356: accent-goblin-words-replace-356
+    accent-goblin-words-357: accent-goblin-words-replace-357
+    accent-goblin-words-358: accent-goblin-words-replace-358
+    accent-goblin-words-359: accent-goblin-words-replace-359
+    accent-goblin-words-360: accent-goblin-words-replace-360
+    accent-goblin-words-361: accent-goblin-words-replace-361
+    accent-goblin-words-362: accent-goblin-words-replace-362
+    accent-goblin-words-363: accent-goblin-words-replace-363
+    accent-goblin-words-364: accent-goblin-words-replace-364
+    accent-goblin-words-365: accent-goblin-words-replace-365
+    accent-goblin-words-366: accent-goblin-words-replace-366
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml b/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml
new file mode 100644
index 00000000000..d8073e972cd
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml
@@ -0,0 +1,82 @@
+# Goblin Ears
+- type: marking
+  id: GoblinEarsBasic
+  bodyPart: HeadTop
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_ears.rsi
+    state: goblin_ears_default
+
+- type: marking
+  id: GoblinEarsBasicAlt
+  bodyPart: HeadTop
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_ears.rsi
+    state: goblin_ears_default_alt
+
+- type: marking
+  id: GoblinEarsLong01
+  bodyPart: HeadTop
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_ears.rsi
+    state: goblin_ears_long_01
+
+- type: marking
+  id: GoblinEarsLong02
+  bodyPart: HeadTop
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_ears.rsi
+    state: goblin_ears_long_02
+
+# Goblin Noses
+- type: marking
+  id: GoblinNoseBasic
+  bodyPart: Snout
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_noses.rsi
+    state: goblin_nose_default
+
+- type: marking
+  id: GoblinNoseLong
+  bodyPart: Snout
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_noses.rsi
+    state: goblin_nose_long
+
+- type: marking
+  id: GoblinNoseCrooked
+  bodyPart: Snout
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_noses.rsi
+    state: goblin_nose_crooked
+
+# Goblin Tusks
+- type: marking
+  id: GoblinTusksBasic
+  bodyPart: Snout
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_tusks.rsi
+    state: goblin_tusks_none
+
+- type: marking
+  id: GoblinTusksSmall
+  bodyPart: Snout
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_tusks.rsi
+    state: goblin_tusks_small
+
+- type: marking
+  id: GoblinTusksBig
+  bodyPart: Snout
+  groupWhitelist: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_tusks.rsi
+    state: goblin_tusks_big
diff --git a/Resources/Prototypes/_NF/SoundCollections/goblin_soundcollection.yml b/Resources/Prototypes/_NF/SoundCollections/goblin_soundcollection.yml
new file mode 100644
index 00000000000..dad733aaf26
--- /dev/null
+++ b/Resources/Prototypes/_NF/SoundCollections/goblin_soundcollection.yml
@@ -0,0 +1,32 @@
+- type: soundCollection
+  id: GoblinScreams
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-scream-01.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-scream-02.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-scream-03.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-scream-04.ogg
+
+- type: soundCollection
+  id: GoblinCackle
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg
+
+- type: soundCollection
+  id: GoblinCry
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-cry-01.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cry-02.ogg
+
+- type: soundCollection
+  id: GoblinChatter
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg
+
+- type: soundCollection
+  id: GoblinHiss
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg
diff --git a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
new file mode 100644
index 00000000000..a921b5322a9
--- /dev/null
+++ b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
@@ -0,0 +1,64 @@
+# Goblins
+- type: emoteSounds
+  id: MaleGoblin
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: GoblinScreams
+    Laugh:
+      collection: GoblinCackle
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: GoblinCry
+    Whistle:
+      collection: Whistles
+    Weh:
+      collection: Weh
+
+- type: emoteSounds
+  id: FemaleGoblin
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: GoblinScreams
+    Laugh:
+      collection: GoblinCackle
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: GoblinCry
+    Whistle:
+      collection: Whistles
+    Weh:
+      collection: Weh
diff --git a/Resources/Prototypes/_NF/Voice/speech_verbs.yml b/Resources/Prototypes/_NF/Voice/speech_verbs.yml
new file mode 100644
index 00000000000..1ce605f5a6f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Voice/speech_verbs.yml
@@ -0,0 +1,9 @@
+- type: speechVerb
+  id: Goblin
+  name: chat-speech-verb-name-goblin
+  speechVerbStrings:
+  - chat-speech-verb-goblin-1
+  - chat-speech-verb-goblin-2
+  - chat-speech-verb-goblin-3
+  - chat-speech-verb-goblin-4
+  - chat-speech-verb-goblin-5
\ No newline at end of file
diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml
index a215ee45be1..92339a8a741 100644
--- a/Resources/Prototypes/audio.yml
+++ b/Resources/Prototypes/audio.yml
@@ -200,10 +200,8 @@
     - /Audio/Ambience/constellations.ogg
     - /Audio/Ambience/starlight.ogg
     - /Audio/Ambience/drifting.ogg
-    - /Audio/Ambience/spookyspace1.ogg
-    - /Audio/Ambience/spookyspace2.ogg
-    - /Audio/Ambience/ambispace2.ogg
-    - /Audio/Lobby/title2.ogg
+    - /Audio/Ambience/Further_Out_Now.ogg
+
 
 - type: soundCollection
   id: AmbienceSpooky
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml b/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml
new file mode 100644
index 00000000000..9c1f762e6af
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml
@@ -0,0 +1,15 @@
+<Document>
+  # Goblin
+
+  <Box>
+    <GuideEntityEmbed Entity="AppearanceGoblin" Caption=""/>
+  </Box>
+
+  Goblins can eat raw meat with no ill effects, but sugar and food made with sugar tastes disgusting to them and makes them vomit.
+
+  They take [color=#1e90ff]20% less Poison damage and 20% less Burn damage[/color],
+  but they take [color=#ffa500]25% more Brute damage.[/color]
+
+  Goblins deal reduced Slash damage with their unarmed attack.
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
index 24ef25e8b5a..580536eddca 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
@@ -17,6 +17,7 @@
   </Box>
   <Box>
     <GuideEntityEmbed Entity="AppearanceVulpkanin" Caption="Canidae"/>
+    <GuideEntityEmbed Entity="AppearanceGoblin" Caption="Goblin"/>
   </Box>
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Persistence/BasicPrecursorObjectives.xml b/Resources/ServerInfo/Guidebook/Persistence/BasicPrecursorObjectives.xml
new file mode 100644
index 00000000000..a966ffb4fc7
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Persistence/BasicPrecursorObjectives.xml
@@ -0,0 +1,15 @@
+<Document>
+  # Basic Precursor Objectives
+  This guide will explain the basic objectives that every Job Network Implant can see.
+
+  ## Get Drunk or High
+  These objectives will task you with gaining a lot of a particular status effect.
+  To complete the objective you should consume a lot of a reagent that causes this status effect.
+  For example, if you are tasked to get very drunk you must consume a lot of alchohol in a short period of time.
+
+  ## Moving Up
+  You must complete at least five basic objectives before you can choose a Rogue Network to join.
+  Joining a network will unlock more advanced objectives but you will continue to get basic objectives as well.
+
+</Document>
+
diff --git a/Resources/ServerInfo/Guidebook/Persistence/Dealer.xml b/Resources/ServerInfo/Guidebook/Persistence/Dealer.xml
new file mode 100644
index 00000000000..9de62145c25
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Persistence/Dealer.xml
@@ -0,0 +1,20 @@
+<Document>
+  # Dealer
+  This guide will explain the network objectives that members of the Dealer network will get
+
+  ## Criminal Bounties
+  You will get a bounty to export a certain type of reagent, gas or item to an occupied Trade Station.
+  The first step is using a cargo telepad to teleport a bounty manifest to you. You must be next to the telepad.
+  For reagent bounties you must attach the label to a liquid tank.
+  For gas bounties attach the label to a canister.
+  For solid item bounties attach the label to a crate.
+
+  Export the bounty to the specified station.
+
+  Beware of local authorities as these bounties will hurt local infrastructure and raise Sector Chaos.
+
+  ## The Hunter Becomes the Hunted
+  If you are hunted by someone you can enter their secret phrase to compromise them, receiving the reward and neutralizing the hunt.
+
+</Document>
+
diff --git a/Resources/ServerInfo/Guidebook/Persistence/Hunter.xml b/Resources/ServerInfo/Guidebook/Persistence/Hunter.xml
new file mode 100644
index 00000000000..65422de3b39
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Persistence/Hunter.xml
@@ -0,0 +1,17 @@
+<Document>
+  # Bounty Hunter & Assassin
+  This guide will explain the network objectives that members of the Bounty Hunter and Assassin networks will get
+  Bounty Hunters and Assassins get the same objectives, but will not target members of their own network.
+
+  ## The Hunt
+  If possible you will be assigned a target from a different network to hunt.
+  You must extract their secret phrase.
+  If they wont give it to you voluntarily you can use a secret phrase extractor to force it out.
+  You can obtain a secret phrase extractor from any autolathe.
+  The target must be handcuffed or in a critical or dead state for the extractor to work.
+
+  ## The Hunter Becomes the Hunted
+  If you are hunted by someone you can enter their secret phrase to compromise them, receiving the reward and neutralizing the hunt.
+
+</Document>
+
diff --git a/Resources/ServerInfo/Guidebook/Persistence/Precursor.xml b/Resources/ServerInfo/Guidebook/Persistence/Precursor.xml
new file mode 100644
index 00000000000..35c14e2d1e7
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Persistence/Precursor.xml
@@ -0,0 +1,15 @@
+<Document>
+  # Precursor
+  This guide will explain Precursor and its related mechanics.
+
+  ## The Basics
+  Precursor can be obtained by doing objectives found in the Job Network Implant.
+  Once you have enough precursor you can join a Rogue Network and get more advanced objectives.
+  Members of a Rogue Network can use Precursor to purchase unique items that are otherwise unobtainable.
+
+  ## The ins and outs
+  Precursor is only useful to members of the Rogue Networks.
+  Participating in a Rogue Network can be dangerous as you may be hunted by members of other Rogue Networks or local authorities.
+  If you are hunted down, you will be compromised and lose all Rogue Experience and a lot of stored Precursor.
+</Document>
+
diff --git a/Resources/ServerInfo/Guidebook/Persistence/Purchases.xml b/Resources/ServerInfo/Guidebook/Persistence/Purchases.xml
new file mode 100644
index 00000000000..0175a6fd57f
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Persistence/Purchases.xml
@@ -0,0 +1,16 @@
+<Document>
+  # Precursor Purchases
+  This guide will explain how to use precursor to purchase rare items.
+  Only members of a Rogue Network will be able to use precursor to do purchases.
+
+  ## Rogue Levels
+  As you earn precursor you gain experience towards higher Rogue Levels.
+  More powerful and rare items are locked behind higher Rogue Levels.
+  If your secret phrase is compromised you will be cast out of your Rogue Network and be reset to the lowest Rogue Level.
+
+  ## Making a Purchase
+  In order to make a purchase through the Purchases tab you must be nearby a cargo telepad.
+
+
+</Document>
+
diff --git a/Resources/ServerInfo/Guidebook/Persistence/SectorChaos.xml b/Resources/ServerInfo/Guidebook/Persistence/SectorChaos.xml
new file mode 100644
index 00000000000..55a711531a9
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Persistence/SectorChaos.xml
@@ -0,0 +1,12 @@
+<Document>
+  # Sector Chaos
+  This guide will explain Sector Chaos, one of the consequences of participation in the Precursor system.
+
+  ## Chaos Rising
+  Every time precusor is earned the Sector Chaos will rise by an equal amount.
+  As Sector Chaos rises some dangerous effects and events will curse the Sector.
+  The nature of these effects is very unpredictable.
+  After a major Chaos Consequence, the Sector Chaos will reset.
+
+</Document>
+
diff --git a/Resources/Textures/Structures/Walls/court_wooden_fence.rsi/door_opened_court.png b/Resources/Textures/Structures/Walls/court_wooden_fence.rsi/door_opened_court.png
index 21f2d05d5ff..f829262d826 100644
Binary files a/Resources/Textures/Structures/Walls/court_wooden_fence.rsi/door_opened_court.png and b/Resources/Textures/Structures/Walls/court_wooden_fence.rsi/door_opened_court.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default.png
new file mode 100644
index 00000000000..6853f2191b7
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png
new file mode 100644
index 00000000000..a78ad8039df
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png
new file mode 100644
index 00000000000..f72a92c2a02
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png
new file mode 100644
index 00000000000..d5a93bc82d4
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json
new file mode 100644
index 00000000000..5ed9ae60691
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "copyright": "Sprited by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-4.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "goblin_ears_default",
+            "directions": 4
+        },
+        {
+            "name": "goblin_ears_default_alt",
+            "directions": 4
+        },
+        {
+            "name": "goblin_ears_long_01",
+            "directions": 4
+        },
+        {
+            "name": "goblin_ears_long_02",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png
new file mode 100644
index 00000000000..57391860376
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png
new file mode 100644
index 00000000000..fdef1887b21
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png
new file mode 100644
index 00000000000..0403c86463c
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json
new file mode 100644
index 00000000000..4c1b829d8a2
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "copyright": "Sprited by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-4.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "goblin_nose_default",
+            "directions": 4
+        },
+        {
+            "name": "goblin_nose_crooked",
+            "directions": 4
+        },
+        {
+            "name": "goblin_nose_long",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png
new file mode 100644
index 00000000000..fb706ac649e
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png
new file mode 100644
index 00000000000..c8b755b2283
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png
new file mode 100644
index 00000000000..2b0a11239ad
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json
new file mode 100644
index 00000000000..0983b297549
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "copyright": "Sprited by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-4.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "goblin_tusks_small",
+            "directions": 4
+        },
+        {
+            "name": "goblin_tusks_big",
+            "directions": 4
+        },
+        {
+            "name": "goblin_tusks_none",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix-inflamed.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix-inflamed.png
new file mode 100644
index 00000000000..b3cef608dbd
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix-inflamed.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix.png
new file mode 100644
index 00000000000..6fd813e1874
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-left.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-left.png
new file mode 100644
index 00000000000..d6285608ba1
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-right.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-right.png
new file mode 100644
index 00000000000..ad048dcbc72
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain.png
new file mode 100644
index 00000000000..5c16590df34
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/ears.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/ears.png
new file mode 100644
index 00000000000..20f868ee96b
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/ears.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-l.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-l.png
new file mode 100644
index 00000000000..31d52127744
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-l.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-r.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-r.png
new file mode 100644
index 00000000000..2fe98d341b3
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-r.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-off.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-off.png
new file mode 100644
index 00000000000..35aedf25554
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-off.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-on.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-on.png
new file mode 100644
index 00000000000..50573941160
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-on.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-l.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-l.png
new file mode 100644
index 00000000000..dd7041783e8
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-l.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-r.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-r.png
new file mode 100644
index 00000000000..c940ca53215
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-r.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/liver.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/liver.png
new file mode 100644
index 00000000000..eb0f89afb46
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/liver.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-l.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-l.png
new file mode 100644
index 00000000000..6579fea5331
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-l.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-r.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-r.png
new file mode 100644
index 00000000000..c6205816c22
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-r.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/meta.json b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/meta.json
new file mode 100644
index 00000000000..c6774a6ff37
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/meta.json
@@ -0,0 +1,80 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af | modified by erhardsteinhauer (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "appendix"
+    },
+    {
+      "name": "appendix-inflamed"
+    },
+    {
+      "name": "brain"
+    },
+    {
+      "name": "brain-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "brain-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "ears"
+    },
+    {
+      "name": "eyeball-l"
+    },
+    {
+      "name": "eyeball-r"
+    },
+    {
+      "name": "heart-off"
+    },
+    {
+      "name": "heart-on",
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "kidney-l"
+    },
+    {
+      "name": "kidney-r"
+    },
+    {
+      "name": "liver"
+    },
+    {
+      "name": "lung-l"
+    },
+    {
+      "name": "lung-r"
+    },
+    {
+      "name": "stomach"
+    },
+    {
+      "name": "tongue"
+    },
+    {
+      "name": "muscle"
+    },
+    {
+      "name": "nerve"
+    },
+    {
+      "name": "vessel"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/muscle.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/muscle.png
new file mode 100644
index 00000000000..8164e919743
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/muscle.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/nerve.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/nerve.png
new file mode 100644
index 00000000000..9dbc6643e9a
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/nerve.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/stomach.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/stomach.png
new file mode 100644
index 00000000000..3b9d9d57231
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/stomach.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/tongue.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/tongue.png
new file mode 100644
index 00000000000..0bc11733926
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/tongue.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/vessel.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/vessel.png
new file mode 100644
index 00000000000..d69df5f6902
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/vessel.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/eyes.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/eyes.png
new file mode 100644
index 00000000000..6af803f9aae
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/eyes.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/full.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/full.png
new file mode 100644
index 00000000000..cc61ee90dd4
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/full.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_f.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_f.png
new file mode 100644
index 00000000000..f4d5cbf6e04
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_f.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_m.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_m.png
new file mode 100644
index 00000000000..990343a7fd1
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_m.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_arm.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_arm.png
new file mode 100644
index 00000000000..9e3dce618f4
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_arm.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_foot.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_foot.png
new file mode 100644
index 00000000000..53240792ff4
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_foot.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_hand.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_hand.png
new file mode 100644
index 00000000000..7481ebdb3bd
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_hand.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_leg.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_leg.png
new file mode 100644
index 00000000000..bbfa717c6b6
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_leg.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/meta.json b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/meta.json
new file mode 100644
index 00000000000..67edc25e62f
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/meta.json
@@ -0,0 +1,66 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf | modified by erhardsteinhauer (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "eyes",
+      "directions": 4
+    },
+    {
+      "name": "head_f",
+      "directions": 4
+    },
+    {
+      "name": "head_m",
+      "directions": 4
+    },
+    {
+      "name": "l_arm",
+      "directions": 4
+    },
+    {
+      "name": "l_foot",
+      "directions": 4
+    },
+    {
+      "name": "l_hand",
+      "directions": 4
+    },
+    {
+      "name": "l_leg",
+      "directions": 4
+    },
+    {
+      "name": "r_arm",
+      "directions": 4
+    },
+    {
+      "name": "r_foot",
+      "directions": 4
+    },
+    {
+      "name": "r_hand",
+      "directions": 4
+    },
+    {
+      "name": "r_leg",
+      "directions": 4
+    },
+    {
+      "name": "torso_f",
+      "directions": 4
+    },
+    {
+      "name": "torso_m",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_arm.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_arm.png
new file mode 100644
index 00000000000..52a50ae774f
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_arm.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_foot.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_foot.png
new file mode 100644
index 00000000000..8ce0281786f
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_foot.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_hand.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_hand.png
new file mode 100644
index 00000000000..a3051625ce1
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_hand.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_leg.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_leg.png
new file mode 100644
index 00000000000..ae9a48d7232
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_leg.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_f.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_f.png
new file mode 100644
index 00000000000..3c733d38eae
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_f.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_m.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_m.png
new file mode 100644
index 00000000000..4d2302562ee
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_m.png differ
diff --git a/Resources/Textures/_Persistence14/Objects/Tools/grid-configurator.rsi/icon.png b/Resources/Textures/_Persistence14/Objects/Tools/grid-configurator.rsi/icon.png
new file mode 100644
index 00000000000..9617888ce90
Binary files /dev/null and b/Resources/Textures/_Persistence14/Objects/Tools/grid-configurator.rsi/icon.png differ
diff --git a/Resources/Textures/_Persistence14/Objects/Tools/grid-configurator.rsi/meta.json b/Resources/Textures/_Persistence14/Objects/Tools/grid-configurator.rsi/meta.json
new file mode 100644
index 00000000000..7e4a0ef6b97
--- /dev/null
+++ b/Resources/Textures/_Persistence14/Objects/Tools/grid-configurator.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 2,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite made for PSS24 (https://github.com/michaelchessall/SS24-Persistence) by JoulesMango (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2        
+        ]
+      ]
+    }
+  ]
+}