diff --git a/Content.IntegrationTests/Tests/MachineBoardTest.cs b/Content.IntegrationTests/Tests/MachineBoardTest.cs
index a379ef8e0e4..01a4d324382 100644
--- a/Content.IntegrationTests/Tests/MachineBoardTest.cs
+++ b/Content.IntegrationTests/Tests/MachineBoardTest.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Construction.Components;
 using Content.Shared.Construction.Components;
@@ -57,7 +57,7 @@ await server.WaitAssertion(() =>
                 Assert.Multiple(() =>
                 {
                     Assert.That(protoMan.TryIndex<EntityPrototype>(mId, out var mProto),
-                        $"Machine board {p.ID}'s corresponding machine has an invalid prototype."); // Frontier
+                        $"Machine board {p.ID}'s corresponding machine has an invalid prototype.");
                     Assert.That(mProto.TryGetComponent<MachineComponent>(out var mComp, compFact),
                         $"Machine board {p.ID}'s corresponding machine {mId} does not have MachineComponent");
                     Assert.That(mComp.Board, Is.EqualTo(p.ID),
@@ -93,6 +93,11 @@ await server.WaitAssertion(() =>
                     continue;
                 var cId = cbc.Prototype;
 
+                // Frontier: we accept null as board prototypes, but this will fail the assertions.
+                if (cId == "Null")
+                    continue;
+                // End Frontier
+
                 Assert.Multiple(() =>
                 {
                     Assert.That(cId, Is.Not.Null, $"Computer board \"{p.ID}\" does not have a corresponding computer.");
diff --git a/Content.Server/Corvax/Respawn/RespawnSystem.cs b/Content.Server/Corvax/Respawn/RespawnSystem.cs
index 9c2a6ece62b..29563a3c6e9 100644
--- a/Content.Server/Corvax/Respawn/RespawnSystem.cs
+++ b/Content.Server/Corvax/Respawn/RespawnSystem.cs
@@ -45,12 +45,14 @@ public override void Initialize()
         SubscribeLocalEvent<MindContainerComponent, CryosleepBeforeMindRemovedEvent>(OnCryoBeforeMindRemoved);
         SubscribeLocalEvent<MindContainerComponent, CryosleepWakeUpEvent>(OnCryoWakeUp);
 
-        _admin.OnPermsChanged += OnAdminPermsChanged;
+        _admin.OnPermsChanged += OnAdminPermsChanged; // Frontier
+        _player.PlayerStatusChanged += PlayerStatusChanged; // Frontier
 
-        Subs.CVar(_cfg, NFCCVars.RespawnCryoFirstTime, OnRespawnCryoFirstTimeChanged, true);
-        Subs.CVar(_cfg, NFCCVars.RespawnTime, OnRespawnCryoTimeChanged, true);
+        Subs.CVar(_cfg, NFCCVars.RespawnCryoFirstTime, OnRespawnCryoFirstTimeChanged, true); // Frontier
+        Subs.CVar(_cfg, NFCCVars.RespawnTime, OnRespawnCryoTimeChanged, true); // Frontier
     }
 
+    // Frontier: CVar setters
     private void OnRespawnCryoFirstTimeChanged(float value)
     {
         _respawnTimeOnFirstCryo = value;
@@ -60,6 +62,7 @@ private void OnRespawnCryoTimeChanged(float value)
     {
         _respawnTime = value;
     }
+    // End Frontier
 
     private void OnMobStateChanged(EntityUid entity, MindContainerComponent component, MobStateChangedEvent e)
     {
@@ -172,4 +175,17 @@ private ref RespawnData GetRespawnData(NetUserId player)
             _respawnInfo[player] = new RespawnData();
         return ref CollectionsMarshal.GetValueRefOrNullRef(_respawnInfo, player);
     }
+
+    // Frontier: send ghost timer on player connection
+    private void PlayerStatusChanged(object? _, SessionStatusEventArgs args)
+    {
+        var session = args.Session;
+
+        if (args.NewStatus == Robust.Shared.Enums.SessionStatus.InGame &&
+            _respawnInfo.ContainsKey(session.UserId))
+        {
+            RaiseNetworkEvent(new RespawnResetEvent(_respawnInfo[session.UserId].RespawnTime), session);
+        }
+    }
+    // End Frontier
 }
diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs
index 02351c8dab6..e2c551c103c 100644
--- a/Content.Server/Power/Generator/GeneratorSystem.cs
+++ b/Content.Server/Power/Generator/GeneratorSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Audio;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Materials;
@@ -12,6 +11,7 @@
 using Robust.Server.GameObjects;
 using Content.Shared.Radiation.Components; // Frontier
 using Content.Shared.Audio; // Frontier
+using Content.Shared.Materials; // Frontier
 
 namespace Content.Server.Power.Generator;
 
@@ -68,7 +68,19 @@ private void OnEjectFuel(EntityUid uid, FuelGeneratorComponent component, Portab
 
     private void SolidEmpty(EntityUid uid, SolidFuelGeneratorAdapterComponent component, GeneratorEmpty args)
     {
-        _materialStorage.EjectAllMaterial(uid);
+        // Frontier: eject fuel-grade material
+        if (component.EjectedFuelProtoId == null)
+            _materialStorage.EjectAllMaterial(uid);
+        else
+        {
+            int materialAmount = _materialStorage.GetMaterialAmount(uid, component.FuelMaterial);
+            _materialStorage.TryChangeMaterialAmount(uid, component.FuelMaterial, -materialAmount);
+
+            var ejectedUid = Spawn(component.EjectedFuelProtoId, Transform(uid).Coordinates);
+            if (TryComp<PhysicalCompositionComponent>(ejectedUid, out var phys))
+                phys.MaterialComposition[component.FuelMaterial] = materialAmount;
+        }
+        // End Frontier
     }
 
     private void ChemicalEmpty(Entity<ChemicalFuelGeneratorAdapterComponent> entity, ref GeneratorEmpty args)
diff --git a/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs b/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs
index 61c69f2a235..0274f8fe42a 100644
--- a/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs
+++ b/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Materials;
 using Content.Shared.Power.Generator;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes; // Frontier
 
 namespace Content.Server.Power.Generator;
 
@@ -37,4 +38,11 @@ public sealed partial class SolidFuelGeneratorAdapterComponent : Component
     /// </summary>
     [DataField("multiplier"), ViewVariables(VVAccess.ReadWrite)]
     public float Multiplier;
+
+    /// <summary>
+    /// Frontier: entity to spawn for ejected fuel.  If null, will spawn material stacks as normal.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string? EjectedFuelProtoId;
 }
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 70f061c1bc1..5398a275a7b 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4597,3 +4597,24 @@ Entries:
         were increased.
   id: 5407
   time: '2024-10-15T23:58:44.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Respawn timers are now properly shown on reconnect.
+  id: 5408
+  time: '2024-10-16T10:11:54.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Added admeme mob/boss for Halloween: The Goblinbane - a possessed toiled
+        hellbent on destroying goblinkind. And felinids. And folks in chaplain
+        clothes. Can be controlled by ghosts.
+  id: 5409
+  time: '2024-10-16T10:12:38.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Adds medical pen recipes to the medical assembler.
+  id: 5410
+  time: '2024-10-16T10:18:31.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/advertisements/mobchatter/goblinbane.ftl b/Resources/Locale/en-US/_NF/advertisements/mobchatter/goblinbane.ftl
new file mode 100644
index 00000000000..40bba30b665
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/advertisements/mobchatter/goblinbane.ftl
@@ -0,0 +1,20 @@
+advertisement-goblinbane-1 = The only good goblin is clean goblin! Clean goblin is DEAD goblin!
+advertisement-goblinbane-2 = Have you washed your hands lately, goblin? With soap?
+advertisement-goblinbane-3 = When was the last time you flossed?
+advertisement-goblinbane-4 = Come here! I'll wash your face off!
+advertisement-goblinbane-5 = You. Will. Suffer. Uhh.. I mean.. You'll become clean!
+advertisement-goblinbane-6 = Soap! Ever heard of it?!
+advertisement-goblinbane-7 = Filth. I despise it. I seek to eradicate it. Goblins are filthy.
+advertisement-goblinbane-8 = Want to hear a joke? Knock-knock. Who's there? Goblin janitor! Hhah!
+advertisement-goblinbane-9 = I'm walking, seeking, cleaning and cleansing.
+advertisement-goblinbane-10 = Your untidiness makes my water boil!
+advertisement-goblinbane-11 = Space Cleaner!
+advertisement-goblinbane-12 = You should've used paper tovels after washing your hands.
+advertisement-goblinbane-13 = I could smell you from adjacent compartment, goblin.
+advertisement-goblinbane-14 = There will be no mercy, unclean one!
+advertisement-goblinbane-15 = Goblins. Dirt. I hate dirt.
+advertisement-goblinbane-16 = Here, gobbo-gobbo-gobbo! I wont bite! Pinky promise!
+advertisement-goblinbane-17 = When I'm done scraping the dirt from you I'll make a mop handle from your bones.
+advertisement-goblinbane-18 = If you don't brush your teeth, I'll brush them off off you.
+advertisement-goblinbane-19 = *gurgles*
+advertisement-goblinbane-20 = You didn't flush!!
diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
index f4ebc71ac45..3e3aaf75ba4 100644
--- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
@@ -55,3 +55,15 @@ ghost-role-information-dungeon-boss-rules = You are a [color=red][bold]Team Anta
                                         - [color=red]DO NOT[/color] gib players. Once they're dead, leave them be.
                                         - [color=red]DO NOT[/color] destroy or hide valuable loot in the dungeon.
                                         - [color=red]DO NOT[/color] leave the planet.
+
+ghost-role-information-goblinbane-name = The Goblinbane
+ghost-role-information-goblinbane-ghost-name = The Ghost of Goblinbane
+ghost-role-information-goblinbane-description = Hunt down those pesky-little-dirty-smelly goblins. And felinids. And also chaplains.
+ghost-role-information-goblinbane-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color] capable of summoning minions. [color=yellow]Do note[/color], your minions will be hostile to everyone, except you.
+                                        Search and destroy goblins/felinids/chaplains.
+                                        Please note that [color=yellow]all server rules still apply.[/color]. Additionally:
+                                        - [color=yellow]Reminder[/color] that Frontier Outpost (the station and 200m area around it) is a safe zone.
+                                        - [color=red]DO NOT[/color] attack players on the Outpost.
+                                        - [color=red]DO NOT[/color] use your abilities on the Outpost.
+                                        - [color=red]DO NOT[/color] intentionally damage Frontier Outpost, other POIs, shuttles.
+                                        - [color=red]DO NOT[/color] devour walls and airlocks on Frontier Outpost, other POIs, shuttles.
diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
index 50c5dad3f97..af7d009cb09 100644
--- a/Resources/Maps/_NF/Dungeon/cave_factory.yml
+++ b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -8247,18 +8247,6 @@ entities:
     - type: Transform
       pos: 26.5,30.5
       parent: 1
-- proto: DebugSMES
-  entities:
-  - uid: 966
-    components:
-    - type: Transform
-      pos: 22.5,32.5
-      parent: 1
-  - uid: 969
-    components:
-    - type: Transform
-      pos: 18.5,32.5
-      parent: 1
 - proto: DiseaseDiagnoser
   entities:
   - uid: 1419
@@ -8273,18 +8261,6 @@ entities:
     - type: Transform
       pos: 22.5,16.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        DisposalUnit: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 551
-        disposals: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-    - type: Timer
   - uid: 724
     components:
     - type: Transform
@@ -8737,16 +8713,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,28.5
       parent: 1
-    - type: Fixtures
-      fixtures: {}
   - uid: 940
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 10.5,28.5
       parent: 1
-    - type: Fixtures
-      fixtures: {}
 - proto: FloraRockSolid01
   entities:
   - uid: 1954
@@ -9134,18 +9106,6 @@ entities:
       parent: 1
 - proto: HospitalCurtains
   entities:
-  - uid: 944
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,24.5
-      parent: 1
-    - type: Occluder
-      enabled: False
-    - type: Door
-      state: Open
-    - type: Physics
-      canCollide: False
   - uid: 945
     components:
     - type: Transform
@@ -9160,6 +9120,12 @@ entities:
       parent: 1
 - proto: HospitalCurtainsOpen
   entities:
+  - uid: 944
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,24.5
+      parent: 1
   - uid: 941
     components:
     - type: Transform
@@ -9329,8 +9295,6 @@ entities:
     components:
     - type: Transform
       parent: 550
-    - type: Physics
-      canCollide: False
 - proto: MedicalBed
   entities:
   - uid: 1141
@@ -9492,15 +9456,13 @@ entities:
     - type: Transform
       pos: 20.590317,3.594551
       parent: 1
-- proto: PortableGeneratorHyperPacmanShuttle
+- proto: PortableGeneratorHyperPacman
   entities:
   - uid: 2077
     components:
     - type: Transform
       pos: 32.5,20.5
       parent: 1
-    - type: FuelGenerator
-      on: False
 - proto: PortableGeneratorPacman
   entities:
   - uid: 962
@@ -11393,6 +11355,16 @@ entities:
       parent: 1
 - proto: SMESBasic
   entities:
+  - uid: 966
+    components:
+    - type: Transform
+      pos: 22.5,32.5
+      parent: 1
+  - uid: 969
+    components:
+    - type: Transform
+      pos: 18.5,32.5
+      parent: 1
   - uid: 47
     components:
     - type: Transform
@@ -13672,7 +13644,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 1
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 927
     components:
diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml
index 94729a67b1e..dd2909a254d 100644
--- a/Resources/Maps/_NF/Dungeon/experiment.yml
+++ b/Resources/Maps/_NF/Dungeon/experiment.yml
@@ -10347,7 +10347,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,1.5
       parent: 1653
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 799
     components:
diff --git a/Resources/Maps/_NF/Dungeon/haunted.yml b/Resources/Maps/_NF/Dungeon/haunted.yml
index 90d75188d65..0b95c70ba4c 100644
--- a/Resources/Maps/_NF/Dungeon/haunted.yml
+++ b/Resources/Maps/_NF/Dungeon/haunted.yml
@@ -473,13 +473,6 @@ entities:
     - type: Transform
       pos: 9.5,28.5
       parent: 1653
-- proto: CigaretteCapsaicinOil
-  entities:
-  - uid: 322
-    components:
-    - type: Transform
-      pos: 31.649122,18.823664
-      parent: 1653
 - proto: ClothingHeadHatFlowerWreath
   entities:
   - uid: 233
@@ -1456,28 +1449,26 @@ entities:
       parent: 1653
 - proto: OreBox
   entities:
-  - uid: 184
+  - uid: 161
     components:
     - type: Transform
       pos: 2.5,24.5
       parent: 1653
-  - uid: 270
+  - uid: 164
     components:
     - type: Transform
       pos: 37.5,4.5
       parent: 1653
-  - uid: 283
+  - uid: 165
     components:
     - type: Transform
       pos: 17.5,8.5
       parent: 1653
-  - uid: 488
+  - uid: 184
     components:
     - type: Transform
-      pos: 29.496475,8.499265
+      pos: 29.5,8.5
       parent: 1653
-    - type: Physics
-      fixedRotation: False
 - proto: OreProcessor
   entities:
   - uid: 231
@@ -1564,13 +1555,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 10.5,45.5
       parent: 1653
-- proto: PuddleVomit
-  entities:
-  - uid: 229
-    components:
-    - type: Transform
-      pos: 3.5,45.5
-      parent: 1653
 - proto: Rack
   entities:
   - uid: 276
@@ -1809,6 +1793,16 @@ entities:
     - type: Transform
       pos: 2.6439443,45.462845
       parent: 1653
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 4.4356813,1.5142399
+      parent: 1653
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 13.473847,3.4530866
+      parent: 1653
   - uid: 240
     components:
     - type: Transform
@@ -1839,6 +1833,11 @@ entities:
     - type: Transform
       pos: 31.586864,30.529964
       parent: 1653
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 14.9959345,10.159707
+      parent: 1653
   - uid: 563
     components:
     - type: Transform
@@ -2467,23 +2466,6 @@ entities:
     - type: Transform
       pos: 2.6935458,19.305508
       parent: 1653
-- proto: SpawnDungeonLootMeleeT1
-  entities:
-  - uid: 503
-    components:
-    - type: Transform
-      pos: 4.279275,1.5174387
-      parent: 1653
-  - uid: 504
-    components:
-    - type: Transform
-      pos: 13.09337,3.5103157
-      parent: 1653
-  - uid: 509
-    components:
-    - type: Transform
-      pos: 14.9959345,10.159707
-      parent: 1653
 - proto: SpawnDungeonLootOresFull
   entities:
   - uid: 191
@@ -2779,13 +2761,6 @@ entities:
     - type: Transform
       pos: 4.5500164,45.666206
       parent: 1653
-- proto: SpawnMobFrog
-  entities:
-  - uid: 386
-    components:
-    - type: Transform
-      pos: 18.5,44.5
-      parent: 1653
 - proto: SteelBench
   entities:
   - uid: 71
@@ -2849,7 +2824,7 @@ entities:
     - type: Transform
       pos: 36.5,31.5
       parent: 1653
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 406
     components:
@@ -2917,35 +2892,38 @@ entities:
     - type: Transform
       pos: 2.5,47.5
       parent: 1653
-  - uid: 161
+  - uid: 163
     components:
     - type: Transform
-      pos: 1.5,44.5
+      pos: 5.5,45.5
       parent: 1653
-  - uid: 163
+  - uid: 247
     components:
     - type: Transform
-      pos: 5.5,45.5
+      pos: 10.5,47.5
       parent: 1653
-  - uid: 164
+  - uid: 265
     components:
     - type: Transform
-      pos: 1.5,46.5
+      pos: 21.5,46.5
       parent: 1653
-  - uid: 165
+  - uid: 269
     components:
     - type: Transform
-      pos: 1.5,45.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,44.5
       parent: 1653
-  - uid: 247
+  - uid: 270
     components:
     - type: Transform
-      pos: 10.5,47.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,46.5
       parent: 1653
-  - uid: 265
+  - uid: 283
     components:
     - type: Transform
-      pos: 21.5,46.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,45.5
       parent: 1653
   - uid: 329
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
index 85a4910afda..20b358c13ca 100644
--- a/Resources/Maps/_NF/Dungeon/lava_brig.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -7212,18 +7212,6 @@ entities:
     - type: Transform
       pos: 14.5,47.5
       parent: 588
-- proto: DebugSMES
-  entities:
-  - uid: 971
-    components:
-    - type: Transform
-      pos: 22.5,32.5
-      parent: 588
-  - uid: 974
-    components:
-    - type: Transform
-      pos: 18.5,32.5
-      parent: 588
 - proto: DeployableBarrier
   entities:
   - uid: 1233
@@ -10248,6 +10236,16 @@ entities:
       parent: 588
 - proto: SMESBasic
   entities:
+  - uid: 971
+    components:
+    - type: Transform
+      pos: 22.5,32.5
+      parent: 588
+  - uid: 974
+    components:
+    - type: Transform
+      pos: 18.5,32.5
+      parent: 588
   - uid: 46
     components:
     - type: Transform
@@ -12154,7 +12152,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 588
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 932
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
index 95e245b0ec0..4d130f1c69f 100644
--- a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -7334,18 +7334,6 @@ entities:
     - type: Transform
       pos: 19.5,35.5
       parent: 588
-- proto: DebugSMES
-  entities:
-  - uid: 971
-    components:
-    - type: Transform
-      pos: 22.5,32.5
-      parent: 588
-  - uid: 974
-    components:
-    - type: Transform
-      pos: 18.5,32.5
-      parent: 588
 - proto: DiseaseDiagnoser
   entities:
   - uid: 1424
@@ -10262,6 +10250,16 @@ entities:
       parent: 588
 - proto: SMESBasic
   entities:
+  - uid: 971
+    components:
+    - type: Transform
+      pos: 22.5,32.5
+      parent: 588
+  - uid: 974
+    components:
+    - type: Transform
+      pos: 18.5,32.5
+      parent: 588
   - uid: 46
     components:
     - type: Transform
@@ -12276,7 +12274,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 588
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 932
     components:
diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
index a30c5a98835..703560cc05d 100644
--- a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
+++ b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -10995,7 +10995,7 @@ entities:
     - type: Transform
       pos: 36.5,32.5
       parent: 1653
-- proto: ResearchAndDevelopmentServer
+- proto: MachineFrame
   entities:
   - uid: 1883
     components:
@@ -14910,7 +14910,7 @@ entities:
     - type: Transform
       pos: 22.5,28.5
       parent: 1653
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 157
     components:
diff --git a/Resources/Maps/_NF/Dungeon/snowy_labs.yml b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
index 3d12496c062..17ee0f8c8ad 100644
--- a/Resources/Maps/_NF/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
@@ -7172,8 +7172,6 @@ entities:
     - type: Transform
       pos: 0.5,22.5
       parent: 1653
-    - type: Fixtures
-      fixtures: {}
 - proto: FloraTreeSnow01
   entities:
   - uid: 1133
@@ -7215,13 +7213,6 @@ entities:
     - type: Transform
       pos: 12.556688,14.57218
       parent: 1653
-  - uid: 805
-    components:
-    - type: MetaData
-      name: strange berries
-    - type: Transform
-      pos: 10.525438,14.587805
-      parent: 1653
 - proto: FoodCondimentBottleColdsauce
   entities:
   - uid: 1841
@@ -7229,13 +7220,6 @@ entities:
     - type: Transform
       pos: 5.5153017,13.652036
       parent: 1653
-- proto: FoodGatfruit
-  entities:
-  - uid: 295
-    components:
-    - type: Transform
-      pos: 3.4733143,14.462859
-      parent: 1653
 - proto: FoodPotato
   entities:
   - uid: 1396
@@ -10093,14 +10077,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,26.5
       parent: 1653
-- proto: MagicalLamp
-  entities:
-  - uid: 1204
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5085075,47.438328
-      parent: 1653
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 1245
@@ -13513,7 +13489,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,1.5
       parent: 1653
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 889
     components:
diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml
index 1a5aa159999..32485971122 100644
--- a/Resources/Maps/_NF/Dungeon/virology_lab.yml
+++ b/Resources/Maps/_NF/Dungeon/virology_lab.yml
@@ -9984,7 +9984,7 @@ entities:
     - type: Transform
       pos: 10.5,1.5
       parent: 1653
-- proto: ResearchAndDevelopmentServer
+- proto: MachineFrame
   entities:
   - uid: 864
     components:
@@ -13497,7 +13497,7 @@ entities:
     - type: Transform
       pos: 20.5,24.5
       parent: 1653
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 1924
     components:
@@ -13505,7 +13505,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 52.5,0.5
       parent: 1653
-- proto: ToiletEmpty
+- proto: ToiletMemeSpawner
   entities:
   - uid: 799
     components:
diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml
index 9d877432d31..6aceed30899 100644
--- a/Resources/Maps/_NF/POI/grifty.yml
+++ b/Resources/Maps/_NF/POI/grifty.yml
@@ -5558,7 +5558,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,1.5
       parent: 1
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 326
     components:
diff --git a/Resources/Maps/_NF/POI/mchobo.yml b/Resources/Maps/_NF/POI/mchobo.yml
index e12b868e4c9..e879feb864b 100644
--- a/Resources/Maps/_NF/POI/mchobo.yml
+++ b/Resources/Maps/_NF/POI/mchobo.yml
@@ -5998,7 +5998,7 @@ entities:
     - type: Transform
       pos: -6.5,8.5
       parent: 1
-- proto: ToiletDirtyWater
+- proto: ToiletMemeSpawner
   entities:
   - uid: 932
     components:
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 16b73470987..c25d9474760 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -201,7 +201,7 @@
   - type: Appearance
 
 - type: entity
-  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
+  parent: [ JanitorClothes, NFClothingBeltStorageBase ] # Frontier: added JanitorClothes
   id: ClothingBeltJanitor
   name: janibelt
   description: A belt used to hold most janitorial supplies.
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index d91fd8c2ae3..0c3cd3a6099 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -95,7 +95,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingOuterBaseToggleable
+  parent: [ ChaplainClothes, ClothingOuterBaseToggleable ] # Frontier: added ChaplainClothes
   id: ClothingOuterHoodieChaplain
   name: chaplain's hoodie
   description: Black and strict chaplain hoodie.
@@ -219,7 +219,7 @@
     sprite: Clothing/OuterClothing/Misc/skubbody.rsi
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: [ ChaplainClothes, ClothingOuterBase ] # Frontier: added ChaplainClothes
   id: ClothingOuterPlagueSuit
   name: plague doctor suit
   description: A bad omen.
@@ -230,7 +230,7 @@
     sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: [ ChaplainClothes, ClothingOuterBase ] # Frontier: added ChaplainClothes
   id: ClothingOuterNunRobe
   name: nun robe
   description: Maximum piety in this star system.
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 3a139049105..12ef7876ad3 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -420,7 +420,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterHydro
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [ JanitorClothes, ClothingOuterWinterCoatToggleable ] # Frontier: added JanitorClothes
   id: ClothingOuterWinterJani
   name: janitorial winter coat
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index cbde01b062c..20f7db879ed 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -99,7 +99,7 @@
     sprite: Clothing/Shoes/Specific/cult.rsi
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: [ JanitorClothes, ClothingShoesBase ] # Frontier: added JanitorClothes
   id: ClothingShoesGaloshes
   name: galoshes
   description: Rubber boots.
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index f051216b9b1..860e9f99cf2 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -233,7 +233,7 @@
     sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [ JanitorClothes, ClothingUniformSkirtBase ] # Frontier: added JanitorClothes
   id: ClothingUniformJumpskirtJanitor
   name: janitor jumpskirt
   description: The jumpskirt for the poor sop with a mop.
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 5c78b8c74fa..df41db3a52c 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -113,7 +113,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/ce_turtle.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ChaplainClothes, ClothingUniformBase ] # Frontier: added ChaplainClothes
   id: ClothingUniformJumpsuitChaplain
   name: chaplain's jumpsuit
   description: It's a black jumpsuit, often worn by religious folk.
@@ -408,7 +408,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ JanitorClothes, ClothingUniformBase ] # Frontier: added JanitorClothes
   id: ClothingUniformJumpsuitJanitor
   name: janitor jumpsuit
   description: The jumpsuit for the poor sop with a mop.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index cb811a761e1..380b741c391 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -152,10 +152,8 @@
 
 - type: entity
   id: MobCarpSalvage
-  parent: MobCarp
+  parent: [NFMobRestrictions, MobCarp] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-    - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   name: space carp
@@ -244,7 +242,5 @@
 
 - type: entity
   id: MobSharkSalvage
-  parent: MobShark
+  parent: [NFMobRestrictions, MobShark] # Frontier: add NFMobRestrictions
   suffix: "Salvage Ruleset"
-  components:
-    - type: NFSalvageMobRestrictions
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
index 64f8418d7bc..b4f6227c005 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -205,7 +205,7 @@
         Blunt: 10
 
 - type: entity
-  parent: [ SimpleSpaceMobBase, MobCombat ]
+  parent: [ NFMobRestrictions, SimpleSpaceMobBase, MobCombat ] # Frontier: add NFMobRestrictions
   id: BaseMobFleshSalvage #This one is immune to space!
   name: aberrant flesh
   suffix: "Salvage Ruleset"
@@ -261,7 +261,6 @@
         Slash: 6
   - type: ReplacementAccent
     accent: genericAggressive
-  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   parent: BaseMobFleshSalvage
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index aacf17d4165..e590eea848d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -113,10 +113,8 @@
 
 - type: entity
   id: MobBearSpaceSalvage
-  parent: MobBearSpace
+  parent: [NFMobRestrictions, MobBearSpace] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   name: space kangaroo
@@ -268,10 +266,8 @@
 
 - type: entity
   id: MobSpiderSpaceSalvage
-  parent: MobSpiderSpace
+  parent: [NFMobRestrictions, MobSpiderSpace] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-  - type: NFSalvageMobRestrictions
 
 - type: entity
   name: space cobra
@@ -365,10 +361,8 @@
 
 - type: entity
   id: MobCobraSpaceSalvage
-  parent: MobCobraSpace
+  parent: [NFMobRestrictions, MobCobraSpace] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-    - type: NFSalvageMobRestrictions # Frontier: SalvageMobRestrictions<NFSalvageMobRestrictions
 
 - type: entity
   parent: SimpleSpaceMobBase
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index 896b9ac115f..f109a8bd045 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -82,8 +82,6 @@
 
 - type: entity
   id: MobTickSalvage
-  parent: MobTick
+  parent: [NFMobRestrictions, MobTick] # Frontier: add NFMobRestrictions, remove components
   suffix: "Salvage Ruleset"
-  components:
-  - type: NFSalvageMobRestrictions # Frontier
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index e8c2d13cea4..83ed657291f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -2,7 +2,7 @@
 - type: entity
   name: burrower
   id: MobXeno
-  parent: SimpleSpaceMobBase
+  parent: [NFMobRestrictions, SimpleSpaceMobBase] # Frontier: add NFMobRestrictions
   description: They mostly come at night. Mostly.
   components:
   - type: Insulated
@@ -120,7 +120,6 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
-  - type: NFSalvageMobRestrictions # Frontier
   - type: ReplacementAccent # Frontier
     accent: genericAggressive # Frontier
 
@@ -364,7 +363,7 @@
 
 - type: entity
   name: space adder
-  parent: SimpleSpaceMobBase
+  parent: [NFMobRestrictions, SimpleSpaceMobBase] # Frontier: add NFMobRestrictions
   id: MobPurpleSnake
   description: A menacing purple snake from Kepler-283c.
   components:
@@ -430,7 +429,6 @@
     tags:
     - DoorBumpOpener
     - FootstepSound
-  - type: NFSalvageMobRestrictions # Frontier
   - type: ReplacementAccent # Frontier
     accent: genericAggressive # Frontier
 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index a3c2a1a37cc..678a81debdb 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -186,7 +186,7 @@
     projectileSpeed: 5
 
 - type: entity
-  parent: BaseMobDragon
+  parent: [NFMobRestrictions, BaseMobDragon] # Frontier: add NFMobRestrictions
   id: MobDragonDungeon
   suffix: Dungeon
   components:
@@ -218,7 +218,6 @@
   - type: ActionGun #Frontier
     action: ActionDragonsBreath #Frontier
     gunProto: DragonsBreathGun #Frontier
-  - type: NFSalvageMobRestrictions # Frontier
 
 - type: entity
   id: ActionSpawnRift
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index c65f82c0070..79e3c92278a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -444,19 +444,6 @@
     - type: ComputerTabletopBoard # Frontier
       prototype: ComputerTabletopIFFSyndicate # Frontier
 
-- type: entity
-  parent: BaseComputerCircuitboard
-  id: ShipyardComputerCircuitboard
-  name: shipyard computer board
-  description: A computer printed circuit board for a shipyard computer.
-  components:
-    - type: Sprite
-      state: cpu_supply
-    - type: ComputerBoard
-      prototype: ComputerShipyard
-    - type: ComputerTabletopBoard # Frontier
-      prototype: ComputerTabletopShipyard # Frontier
-
 - type: entity
   parent: BaseComputerCircuitboard
   id: ComputerMassMediaCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 306d10c9289..9d7fa9492af 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -73,8 +73,6 @@
   - type: Stack
     count: 1
 
-# New Frontiers - FuelVend - Expensive plasma sheets
-# This code is licensed under AGPLv3. See LICENSE
 - type: entity
   parent: SheetOtherBase
   id: SheetPlasma
@@ -112,10 +110,6 @@
   - type: Tag
     tags:
     - Sheet
-  - type: StackPrice
-    price: 10
-    vendPrice: 1200 # Frontier: FuelVend price
-# End of modified code
 
 - type: entity
   parent: SheetPlasma
@@ -201,8 +195,6 @@
   - type: Stack
     count: 1
 
-# New Frontiers - FuelVend - Expensive uranium sheets
-# This code is licensed under AGPLv3. See LICENSE
 - type: entity
   parent: [SheetOtherBase, FoodBase]
   id: SheetUranium
@@ -242,9 +234,6 @@
         - ReagentId: Radium
           Quantity: 2
         canReact: false
-  - type: StaticPrice # Frontier: FuelVend price (use inheritance from FoodBase)
-    vendPrice: 2500 # Frontier: FuelVend price
-# End of modified code
 
 - type: entity
   parent: SheetUranium
@@ -303,4 +292,4 @@
     - type: Sprite
       state: meat
     - type: Stack
-      count: 1
+      count: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
index 407f51b32e2..ab9093d734d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
@@ -158,8 +158,8 @@
       reagents:
       - ReagentId: Artifexium
         Quantity: 2 # Frontier 10<2
-  # - type: StaticPrice # Frontier
-  #   price: 0 # Frontier
+  - type: StaticPrice
+    price: 0
   - type: StackPrice # Frontier
     price: 160 # Frontier - 240 at cargo depot, 960 for an artifact's worth (~2x the value of a crafted, unactivated one)
   - type: Stack
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 6456143e7c2..fa2023956fa 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1042,6 +1042,7 @@
       - ClothingOuterHardsuitVoidParamed # Frontier
       - BaseChemistryEmptyVial # Frontier
       - PowerCellSmall # Frontier
+      - BlankMediPen # Frontier
     dynamicRecipes:
       - VialBluespace # Frontier
       - ChemicalPayload
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
index c6c1fb88a0f..d5756f98bdb 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -165,6 +165,7 @@
       fuelEfficiencyConstant: 0.95
     - type: SolidFuelGeneratorAdapter
       fuelMaterial: Plasma
+      ejectedFuelProtoId: FuelPlasma # Frontier
       multiplier: 0.01
     - type: MaterialStorage
       storageLimit: 3000
@@ -231,6 +232,7 @@
       fuelEfficiencyConstant: 0.75
     - type: SolidFuelGeneratorAdapter
       fuelMaterial: Uranium
+      ejectedFuelProtoId: FuelUranium # Frontier
       multiplier: 0.01
     - type: MaterialStorage
       storageLimit: 3000
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml
index 26b5da59489..ab564dde444 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml
@@ -5,7 +5,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: SheetPlasma
+    - id: FuelPlasma
 
 - type: entity # Full stack
   abstract: true
@@ -13,7 +13,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: SheetUranium
+    - id: FuelUranium
 
 - type: entity # Full stack
   abstract: true
@@ -21,7 +21,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: SheetPlasma
+    - id: FuelPlasma
       amount: 2
 
 - type: entity # Full stack
@@ -30,7 +30,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: SheetUranium
+    - id: FuelUranium
       amount: 2
 
 - type: entity # Full stack
@@ -39,7 +39,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: MaterialBananium
+    - id: FuelBananium
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/_NF/Catalog/NPCsChatter/goblinbane.yml b/Resources/Prototypes/_NF/Catalog/NPCsChatter/goblinbane.yml
new file mode 100644
index 00000000000..fced4efdb63
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/NPCsChatter/goblinbane.yml
@@ -0,0 +1,5 @@
+- type: localizedDataset
+  id: goblinbanechatter
+  values:
+    prefix: advertisement-goblinbane-
+    count: 20
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/fuelvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/fuelvend.yml
index 6bde9d51171..540301e5edb 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/fuelvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/fuelvend.yml
@@ -4,7 +4,8 @@
 - type: vendingMachineInventory
   id: VendingMachineFuelVendInventory
   startingInventory:
-    SheetPlasma: 4294967295 # Infinite
-    SheetUranium: 4294967295 # Infinite
+    FuelPlasma: 4294967295 # Infinite
+    FuelUranium: 4294967295 # Infinite
+    FuelBananium: 4294967295 # Infinite
     AmeJar: 4294967295 # Infinite
     JerryCanWeldingFuel: 4294967295 # Infinite
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
index 1a09fc5170a..7f8dfe9b180 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
@@ -10,7 +10,7 @@
     sprite: _NF/Clothing/Belt/arcadia.rsi
 
 - type: entity
-  parent: NFClothingBeltStorageBase
+  parent: [ ChaplainClothes, NFClothingBeltStorageBase ]
   id: ClothingBeltChaplainSash
   name: chaplain sash
   description: Who knew that scarves can be also tied around your waist?
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
index a515f6c081c..b39ed81278f 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
@@ -11,7 +11,7 @@
   - type: HamsterWearable
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatPilgrim
   name: pilgrim's hat
   description: "Thou shalt not suffer a turkey to live."
@@ -22,7 +22,7 @@
     sprite: _NF/Clothing/Head/Hats/pilgrim_hat.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatWideBrimmed
   name: wide-brimmed hat
   description: Works great as frisbee substitute.
@@ -33,7 +33,7 @@
     sprite: _NF/Clothing/Head/Hats/widebrim_hat.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatCardinal
   name: cardinal's hat
   description: Keeps your head well protected from sun and reason.
@@ -44,7 +44,7 @@
     sprite: _NF/Clothing/Head/Hats/cardinal_hat.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatWitchhunter
   name: witch hunter's hat
   description: "Thou shalt not suffer a witch to live."
@@ -55,7 +55,7 @@
     sprite: _NF/Clothing/Head/Hats/witch_hunter_hat.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatBishopMitre
   name: bishop's mitre
   description: How to wear this thing? Ah! The other way around!
@@ -66,7 +66,7 @@
     sprite: _NF/Clothing/Head/Hats/bishop_mitre.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatKippah
   name: kippah
   description: Worn on the head like a dome.
@@ -77,7 +77,7 @@
     sprite: _NF/Clothing/Head/Hats/kippah.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ ChaplainClothes, ClothingHeadBaseButcherable ]
   id: ClothingHeadHatHoodCardinalHood
   categories: [ HideSpawnMenu ]
   name: cardinal's hood
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml
index b945af62931..f01669692ab 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingNeckBase
+  parent: [ ChaplainClothes, ClothingNeckBase ]
   id: ClothingNeckCrucifix
   name: crucifix
   description: Damn, it feels good to be so pious.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml
index 29c406961bd..18d533a5516 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingNeckBase
+  parent: [ ChaplainClothes, ClothingNeckBase ]
   id: ClothingNeckScarfChaplainStole
   name: chaplain's stole
   description: A necessary evil for ordained priests outfit. Gives at least +2 to your holiness.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml
index a9ed69cc139..707fd8e7882 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml
@@ -19,7 +19,7 @@
     damageCoefficient: 0.80
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ ChaplainClothes, ClothingOuterStorageBase ]
   id: ClothingOuterCoatBishop
   name: bishop's robes
   description: Golden threads aren't actually made of gold. Bummer.
@@ -30,7 +30,7 @@
     sprite: _NF/Clothing/OuterClothing/Misc/bishop_robe.rsi
 
 - type: entity
-  parent: ClothingOuterBaseToggleable
+  parent:  [ ChaplainClothes, ClothingOuterBaseToggleable ]
   id: ClothingOuterCoatWitchHunter
   name: witch hunter's coat
   description: Looks even better under constant rain with storm wind.
@@ -43,7 +43,7 @@
     clothingPrototype: ClothingHeadHatHoodChaplainHood
 
 - type: entity
-  parent: ClothingOuterBaseToggleable
+  parent:  [ ChaplainClothes, ClothingOuterBaseToggleable ]
   id: ClothingOuterCoatCardinal
   name: cardinal's coat
   description: Nobody expects the Spanish Inquisition!
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
index 59047597419..482ab9184b5 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -33,7 +33,7 @@
   description: A grey suit, complete with tie clip.
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ChaplainClothes, ClothingUniformBase ]
   id: ClothingUniformJumpsuitChaplainPilgrimVest
   name: pilgrim jumpsuit
   description: Knock-knock. Would you care to have a word about our Lord-n-Savior Nar-Sss.. Err.. Space Jeebus?
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/contraband_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/contraband_clothing_base.yml
deleted file mode 100644
index 06f26324753..00000000000
--- a/Resources/Prototypes/_NF/Entities/Clothing/contraband_clothing_base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: entity
-  id: ContrabandClothing
-  abstract: true
-  components:
-  - type: FactionClothing
-    faction: ContrabandClothing
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml
new file mode 100644
index 00000000000..eb0e334bdd2
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml
@@ -0,0 +1,20 @@
+- type: entity
+  id: ContrabandClothing
+  abstract: true
+  components:
+  - type: FactionClothing
+    faction: ContrabandClothing
+
+- type: entity
+  id: JanitorClothes
+  abstract: true
+  components:
+  - type: FactionClothing
+    faction: JanitorClothes
+
+- type: entity
+  id: ChaplainClothes
+  abstract: true
+  components:
+  - type: FactionClothing
+    faction: ChaplainClothes
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_meme_goblinbane.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_meme_goblinbane.yml
new file mode 100644
index 00000000000..6cac4302933
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_meme_goblinbane.yml
@@ -0,0 +1,107 @@
+# Possessed Toilet
+- type: entity
+  id: SpawnMobMemeGoblinbane
+  name: goblinbane spawner
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: _NF/Mobs/Meme/goblinbane.rsi
+        state: alive
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMemeGoblinbane
+
+# Possessed Mop
+- type: entity
+  id: SpawnMobMemePossessedMop
+  name: possessed mop spawner
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: _NF/Mobs/Meme/goblinbane.rsi
+        state: mop_alive
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMemePossessedMop
+
+# Possessed Spray
+- type: entity
+  id: SpawnMobMemePossessedSpray
+  name: possessed spray spawner
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: _NF/Mobs/Meme/goblinbane.rsi
+        state: spray_alive
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMemePossessedSpray
+
+# Possessed Bucket
+- type: entity
+  id: SpawnMobMemePossessedBucket
+  name: possessed mop bucket spawner
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: _NF/Mobs/Meme/goblinbane.rsi
+        state: bucket_alive
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMemePossessedBucket
+
+# Mop bucket portal
+- type: entity
+  id: SpawnMopBucketDimnsionPortal
+  name: mop bucket portal spawner
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: _NF/Mobs/Meme/goblinbane.rsi
+        state: bucket_portal
+        shader: unshaded
+  - type: ConditionalSpawner
+    prototypes:
+    - MopBucketDimnsionPortal
+  - type: Ammo
+    muzzleFlash: null
+
+# Randomised mob portal(bucket/mop/sprayer)
+- type: entity
+  id: SpawnCleanlinessDimensionPortal
+  name: cleanliness dimension portal spawner
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: _NF/Mobs/Meme/goblinbane.rsi
+        state: bucket_portal
+        shader: unshaded
+  - type: ConditionalSpawner
+    prototypes:
+    - CleanlinessDimensionPortal
+  - type: Ammo
+    muzzleFlash: null
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_meme_goblinbane.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_meme_goblinbane.yml
new file mode 100644
index 00000000000..14f25d7f838
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_meme_goblinbane.yml
@@ -0,0 +1,23 @@
+
+# Mop bucket portal
+- type: entity
+  id: SpawnRandomPossessedJaniTool
+  name: random possessed janitor tool
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: _NF/Mobs/Meme/goblinbane.rsi
+        state: bucket_portal
+        shader: unshaded
+  - type: RandomSpawner
+    prototypes:
+    - MobMemePossessedBucket
+    - MobMemePossessedSpray
+    - MobMemePossessedSpray
+    - MobMemePossessedMop
+  - type: Ammo
+    muzzleFlash: null
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/possessed_toilet.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/possessed_toilet.yml
new file mode 100644
index 00000000000..6d5b4b3b480
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/possessed_toilet.yml
@@ -0,0 +1,19 @@
+- type: entity
+  id: ToiletMemeSpawner
+  name: toilet spawner
+  suffix: Dungeon, Goblinbane
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Furniture/toilet.rsi
+          state: disposal
+    - type: RandomSpawner
+      prototypes:
+        - ToiletDirtyWater
+        - ToiletEmpty
+      chance: 1
+      rarePrototypes:
+        - MobMemeGoblinbane
+      rareChance: 0.05
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/corpses.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/corpses.yml
index 12a857dcbd8..8659effb09d 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/corpses.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/corpses.yml
@@ -12,7 +12,6 @@
     factions:
     - SimpleHostile
   - type: Carriable # Carrying system from nyanotrasen.
-  #- type: NFSalvageMobRestrictions
   - type: Butcherable
     butcheringType: Spike
     spawned:
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml
index b9e12ad674e..c60405e5de7 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml
@@ -139,13 +139,12 @@
 - type: entity
   abstract: true
   id: MobOreCrabNF
-  parent: MobOreCrab
+  parent: [MobOreCrab, NFMobRestrictions]
   components:
   - type: NpcFactionMember
     factions:
     - SimpleHostile # Because AI stupid ass hell right now
   - type: MovementIgnoreGravity # Or they just can't do something
-  - type: NFSalvageMobRestrictions
 
 - type: entity
   parent: MobOreCrabNF
@@ -366,7 +365,7 @@
   abstract: true
   id: MobOreGolem
   name: ore golem
-  parent: [ MobElementalBase, MobCombat ]
+  parent: [ MobElementalBase, MobCombat, NFMobRestrictions ]
   components:
   - type: Sprite
     sprite: /Textures/_NF/Mobs/Elemental/golems.rsi
@@ -390,7 +389,6 @@
   - type: Damageable
     damageContainer: StructuralInorganic
   - type: MovementIgnoreGravity # Or they just can't do something
-  - type: NFSalvageMobRestrictions
   - type: Appearance # Next three components make the mob fall over when dead
   - type: StandingState
   - type: RotationVisuals
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
index ea641b138e5..77ddf668998 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
@@ -83,6 +83,68 @@
     reflects:
       - Energy
 
+- type: entity
+  abstract: true
+  id: NFMobRestrictions
+  components:
+  - type: NFSalvageMobRestrictions
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn30
+  components:
+  - type: TimedDespawn
+    lifetime: 30
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn60
+  components:
+  - type: TimedDespawn
+    lifetime: 60
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn80
+  components:
+  - type: TimedDespawn
+    lifetime: 80
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn120
+  components:
+  - type: TimedDespawn
+    lifetime: 120
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn180
+  components:
+  - type: TimedDespawn
+    lifetime: 180
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn1200
+  components:
+  - type: TimedDespawn
+    lifetime: 1200
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn1800
+  components:
+  - type: TimedDespawn
+    lifetime: 1800
+
+- type: entity
+  abstract: true
+  id: NFMobTimedDespawn3000
+  components:
+  - type: TimedDespawn
+    lifetime: 3000
+
 - type: entity
   save: false
   id: MobEnhancedMovement
@@ -116,6 +178,7 @@
   parent:
   - MobEnhancedMovement
   - MobPassiveRegenWeak
+  - NFMobRestrictions
   components:
   - type: Hands
   - type: Puller
@@ -130,7 +193,6 @@
     - FootstepSound
     - DoorBumpOpener
     - CannotSuicide
-  - type: NFSalvageMobRestrictions
   - type: FTLKnockdownImmune
 
 # Inventories
@@ -267,7 +329,6 @@
     minimumWait: 120 # 1 * 2
     maximumWait: 240 # 2 * 60
     nextAdvertisementTime: 0
-  - type: NFSalvageMobRestrictions
   - type: FTLKnockdownImmune
   - type: Respirator
     updateInterval: 99999 # Shouldn't run often, if ever.
@@ -346,11 +407,10 @@
   - type: MobPrice
     price: 1500
     deathPenalty: 0.5
-  - type: NFSalvageMobRestrictions
   - type: Tag
     tags:
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
     - CannotSuicide
-  - type: FTLKnockdownImmune
+  - type: FTLKnockdownImmune
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml
index d9134cca7d9..ca9f9f3f34f 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml
@@ -1,17 +1,10 @@
-- type: entity
-  abstract: true
-  id: MobBloodCultistTimedDespawn
-  components:
-  - type: TimedDespawn
-    lifetime: 3000 # 50 mins (max blue space event duration involving these mobs - 40 mins)
-
 - type: entity
   name: blood cultist
   abstract: true
   parent:
   - MobHumanoidHostileBase
   - MobHumanoidInvetory
-  #- MobBloodCultistTimedDespawn
+  - NFMobRestrictions
   id: MobBloodCultistBase
   components:
   - type: NpcFactionMember
@@ -203,7 +196,7 @@
   - MobNonHumanHostileBase
   - MobPassiveRegen
   - MobHumanoidHostileAISimpleMelee
-  #- MobBloodCultistTimedDespawn
+  - NFMobRestrictions
   id: MobBloodCultLeech
   description: This cultist, once human, is now a twisted and corrupted abomination, its body warped and distorted by the dark energies of Nar'Sie's influence.
   components:
@@ -254,7 +247,7 @@
   - MobNonHumanHostileBase
   - MobHumanoidHostileAIComplex
   - MobLaserReflect # Added to prevent laser abuse from players
-  #- MobBloodCultistTimedDespawn
+  - NFMobRestrictions
   id: MobBloodCultistAscended
   components:
   - type: NpcFactionMember
@@ -352,6 +345,7 @@
   - FlyingMobBase
   - MobPassiveRegen
   - MobHumanoidHostileAISimpleMelee
+  - NFMobTimedDespawn120
   id: MobBloodCultDrainedOne
   description: A tortured soul, stripped of free will and left as a mere shadow of a human, enslaved and bound to obey its captors.
   components:
@@ -414,8 +408,6 @@
     chemicalMaxVolume: 100
   - type: Speech
     speechVerb: Ghost
-  - type: TimedDespawn
-    lifetime: 110
   - type: Ammo
     muzzleFlash: null
 
@@ -463,7 +455,10 @@
 # Drained One (summonable by players), melee
 - type: entity
   categories: [ HideSpawnMenu ]
-  parent: MobBloodCultDrainedOne
+  parent:
+  - BaseC3MobCreatureNoValue
+  - MobBloodCultDrainedOne
+  - NFMobTimedDespawn180
   id: MobBloodCultDrainedOneNanoTrasen
   components:
   - type: NPCImprintingOnSpawnBehaviour
@@ -483,8 +478,6 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: TimedDespawn
-    lifetime: 180
 
 # Turrets
 # blood pylon, ranged, magic bolt deals 5 slash and 2 bloodloss
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
index 1f26b1bdc1e..745eb61da40 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
@@ -3,6 +3,7 @@
   parent:
   - MobNonHumanHostileBase
   - MobHumanoidHostileAISimpleMelee
+  - NFMobRestrictions
   id: BaseMobFleshExpeditions
   name: aberrant flesh
   description: A shambling mass of flesh, animated through anomalous energy.
@@ -434,7 +435,7 @@
 # FUNNY LITTLE GUY
 # embedable projectile that bites you until you either kill it or detach it or die (or it despawns)
 - type: entity
-  parent: BaseMobFleshExpeditions
+  parent: [ BaseMobFleshExpeditions, NFMobTimedDespawn60 ]
   id: MobMawExpeditions
   name: aberrant flesh maw
   description: Immobile, flesh-boring creatures that are launched at victims. Latches on until killed or shaken off. Don't put your fingers in it.
@@ -479,8 +480,6 @@
     damage:
       types:
         Slash: 4
-  - type: TimedDespawn
-    lifetime: 60
 
 # Newborns (spawned from assimilation sack)
 - type: entity
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml
index 5bae64c7046..226c1a03546 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_argocyte.yml
@@ -1,6 +1,6 @@
 # BASE
 - type: entity
-  parent: MobNonHumanHostileBase
+  parent: [ MobNonHumanHostileBase, NFMobRestrictions ]
   id: BaseMobArgocyteExpeditions
   name: argocyte
   description: |-
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_carp.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_carp.yml
index fb857051c1d..dbb350bd403 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_carp.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_carp.yml
@@ -2,6 +2,7 @@
 - type: entity
   parent:
   - MobNonHumanHostileBase
+  - NFMobRestrictions
   id: BaseMobCarpExpeditions
   name: carp
   description: A variant of the common space carp, evolved to "swim" through gravity. Equally dangerous.
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_dinosaurs.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_dinosaurs.yml
index 88c4ab1561f..0fbb9abfac9 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_dinosaurs.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_dinosaurs.yml
@@ -1,7 +1,7 @@
 # Based on https://github.com/space-wizards/space-station-14/pull/26883 by @Vonsant, sprites by belay5 (discord)
 # BASE
 - type: entity
-  parent: MobNonHumanHostileBase
+  parent: [ MobNonHumanHostileBase, NFMobRestrictions ]
   id: BaseMobDinosaurExpeditions
   name: dinosaur
   description: Enigmatic behemoths from a bygone era, known for their imposing stature and formidable presence.
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
index 75c638ef1e2..844aaacbc5b 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
@@ -6,6 +6,7 @@
   - MobNonHumanHostileBase
   - MobHumanoidInvetory
   - MobHumanoidHostileAISimpleRanged
+  - NFMobRestrictions
   id: MobExplorerBase
   components:
   - type: NpcFactionMember
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_xeno.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_xeno.yml
index d67e754933d..64cfa93c46e 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_xeno.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_xeno.yml
@@ -1,6 +1,6 @@
 # BASE
 - type: entity
-  parent: MobNonHumanHostileBase
+  parent: [ MobNonHumanHostileBase, NFMobRestrictions ]
   id: BaseMobXenoExpeditions
   name: xeno
   description: They mostly come at night. Mostly.
@@ -284,7 +284,6 @@
   - type: Tag
     tags:
     - CannotSuicide
-  - type: NFSalvageMobRestrictions
   - type: ReplacementAccent
     accent: xeno
   - type: GhostRole
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
index 262040d34a2..53ce1e8b8d1 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
@@ -7,6 +7,7 @@
   - MobNonHumanHostileBase
   - MobHumanoidInvetorySimplified
   - MobHumanoidHostileAISimpleRanged
+  - NFMobRestrictions
   id: MobMercenaryBase
   description: A mercenary, merc, soldier of fortune, hired gun, dog of war.
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
index a95215e3174..06742966441 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
@@ -39,13 +39,6 @@
         path: /Audio/Effects/double_beep.ogg
 
 ## Mob base
-- type: entity
-  abstract: true
-  id: MobRogueSiliconTimedDespawn
-  components:
-  - type: TimedDespawn
-    lifetime: 1200 # 20 mins (because these mobs can't be encountered outside expeditions now)
-
 - type: entity
   name: hivemind unit
   abstract: true
@@ -55,7 +48,7 @@
   - MobHumanoidInvetorySimplified
   - MobRogueSiliconAISimpleRanged
   - MobLaserReflect # Added to prevent laser abuse from players
-  #- MobRogueSiliconTimedDespawn
+  - NFMobRestrictions
   id: MobRogueSiliconBase
   components:
   - type: Damageable
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml
index 5ba2f4cc52f..a53327c43c3 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml
@@ -1,11 +1,4 @@
 ## Mob base
-- type: entity
-  abstract: true
-  id: MobWizFedTimedDespawn
-  components:
-  - type: TimedDespawn
-    lifetime: 1800 # 30 mins (max blue space event duration involving these mobs - 20 mins)
-
 - type: entity
   name: Wizard
   abstract: true
@@ -15,7 +8,7 @@
   - MobHumanoidInvetory
   - MobHumanoidHostileAISimpleRanged
   - MobLaserReflect # Added to prevent laser abuse from players
-  #- MobWizFedTimedDespawn
+  - NFMobRestrictions
   id: MobWizFedlBase
   components:
   - type: NpcFactionMember
@@ -196,6 +189,7 @@
   parent:
   - MobNonHumanHostileBase
   - MobHumanoidHostileAISimpleMelee
+  - NFMobTimedDespawn30
   id: WaterElementalConjured
   components:
   - type: HTN
@@ -244,7 +238,5 @@
   - type: MeleeChemicalInjector
     solution: bloodstream
     transferAmount: 10
-  - type: TimedDespawn
-    lifetime: 30
   - type: Ammo
     muzzleFlash: null
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml
new file mode 100644
index 00000000000..044a1267788
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml
@@ -0,0 +1,271 @@
+# Base
+- type: entity
+  abstract: true
+  id: MobIncorporealBase
+  name: incorporeal entity
+  description: You can't touch it, but it can touch you.
+  components:
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/_NF/Effects/silence.ogg
+  - type: CanMoveInAir
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.4
+        density: 10
+        mask:
+        - FlyingMobMask
+        layer:
+        - Opaque
+
+- type: entity
+  id: BaseMobMemeGoblinbane
+  name: "The Goblinbane"
+  parent: [ MobNonHumanHostileBase, MobPassiveRegenWeak, MobHumanoidHostileAIComplex ]
+  description: A Daemon of Cleanliness from the time before time (but after the first toilet was built). An ancient enemy of goblinkind.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: NPCRetaliation
+    attackMemoryLength: 90
+  - type: Advertise
+    pack: goblinbanechatter
+    minimumWait: 30
+    maximumWait: 120
+    nextAdvertisementTime: 10
+  - type: Bloodstream
+    bloodReagent: Bleach
+    chemicalMaxVolume: 100
+  - type: NpcFactionMember
+    factions:
+    - GoblinbaneFaction
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/_NF/Effects/silence.ogg
+  - type: CanMoveInAir
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.40
+        density: 100
+        mask:
+          - FlyingMobMask
+        layer:
+          - FlyingMobLayer
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _NF/Mobs/Meme/goblinbane.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: alive
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: alive_unshaded
+      shader: unshaded
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: alive
+        BaseUnshaded: alive_unshaded
+      Dead:
+        Base: dead
+        BaseUnshaded: dead_unshaded
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      200: Dead
+  - type: Stamina
+    critThreshold: 400
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MobMemeGoblinbaneGhost:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    damage:
+      types:
+        Slash: 12
+        Structural: 20
+    animation: WeaponArcBite
+  - type: MeleeChemicalInjector
+    solution: bloodstream
+    transferAmount: 4
+  - type: PointLight
+    radius: 1.4
+    energy: 1.2
+    color: "#ff0000"
+  # Ghost role stuff
+  - type: GhostRole
+    allowMovement: true
+    name: ghost-role-information-goblinbane-name
+    description: ghost-role-information-goblinbane-description
+    rules: ghost-role-information-goblinbane-rules
+    raffle:
+      settings: default
+  - type: GhostTakeoverAvailable
+  # Radar console (helps locating goblins and such)
+  - type: UserInterface
+    interfaces:
+      enum.RadarConsoleUiKey.Key:
+        type: RadarConsoleBoundUserInterface
+  - type: IntrinsicUI
+    uis:
+      enum.RadarConsoleUiKey.Key:
+        toggleAction: ActionObserverShowRadar
+  - type: RadarConsole
+    followEntity: true
+    maxIffRange: 256
+    hideCoords: true
+  - type: ComplexInteraction
+  # Abilities
+  - type: Devourer
+    foodPreference: Humanoid
+    shouldStoreDevoured: true
+    chemical: Ichor
+    healRate: 15.0
+    whitelist:
+      components:
+      - Goblin
+      - Door
+      tags:
+      - Wall
+  - type: ActionGun
+    action: ActionSpawnCleanlinessDimensionPortal
+    gunProto: CleanlinessDimensionPortalGun
+
+# Possessed Toilet
+- type: entity
+  id: MobMemeGoblinbane
+  name: "The Goblinbane"
+  parent: [ BaseMobMemeGoblinbane, NFMobRestrictions ]
+  description: A Daemon of Cleanliness from the time before time (but after the first toilet was built). An ancient enemy of goblinkind.
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  id: ActionSpawnCleanlinessDimensionPortal
+  name: "[color=orange]Open Cleanliness Portal[/color]"
+  description: "A portal to the dimension of utter cleanliness. No goblins allowed. The ability has [color=yellow]60 second cooldown.[/color]"
+  components:
+  - type: WorldTargetAction
+    icon: { sprite : _NF/Mobs/Meme/goblinbane.rsi, state: bucket_portal }
+    event: !type:ActionGunShootEvent
+    priority: 2
+    checkCanAccess: false
+    range: 0
+    itemIconStyle: BigAction
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  id: CleanlinessDimensionPortalGun
+  name: cleanliness portal Gun
+  description: Spawns the portal.
+  components:
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 60
+    rechargeSound:
+      path: /Audio/Magic/fireball.ogg
+  - type: BasicEntityAmmoProvider
+    proto: SpawnCleanlinessDimensionPortal
+    capacity: 1
+    count: 1
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Effects/teleport_arrival.ogg
+    soundEmpty: null
+    projectileSpeed: 5
+
+# Ghost form of possessed toilet
+- type: entity
+  id: MobMemeGoblinbaneGhost
+  parent: [ MobIncorporealBase, MobMemeGoblinbane ]
+  suffix: Ghost form
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: NpcFactionMember
+    factions:
+    - GoblinbaneProvokedFaction
+  - type: Bloodstream
+    bloodReagent: SoapReagent
+    chemicalMaxVolume: 100
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _NF/Mobs/Meme/goblinbane.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: ghost
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: ghost_unshaded
+      shader: unshaded
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: ghost
+        BaseUnshaded: ghost_unshaded
+      Dead:
+        Base: dead
+        BaseUnshaded: dead_unshaded
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      200: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MobMemePossessedMop:
+            min: 1
+            max: 2
+          MobMemePossessedSpray:
+            min: 2
+            max: 3
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: BasicEntityAmmoProvider
+    proto: SpawnMopBucketDimnsionPortal
+    capacity: 1
+    count: 1
+  - type: Gun
+    showExamineText: false
+    fireRate: 1
+    soundGunshot:
+      path: /Audio/Effects/teleport_arrival.ogg
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 60
+    rechargeSound:
+      path: /Audio/_NF/Effects/silence.ogg
+  - type: MeleeChemicalInjector
+    solution: bloodstream
+    transferAmount: 10
+  # Ghost role stuff
+  - type: GhostRole
+    allowMovement: true
+    name: ghost-role-information-goblinbane-ghost-name
+    description: ghost-role-information-goblinbane-description
+    rules: ghost-role-information-goblinbane-rules
+    raffle:
+      settings: default
+  - type: GhostTakeoverAvailable
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml
new file mode 100644
index 00000000000..644b03da42b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml
@@ -0,0 +1,274 @@
+# Possessed Mop
+- type: entity
+  id: MobMemePossessedMop
+  name: possessed mop
+  parent: [ MobIncorporealBase, BaseMobMemeGoblinbane, NFMobTimedDespawn120 ]
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HTN
+    rootTask:
+       task: MeleeFollowerCompound
+  - type: NPCImprintingOnSpawnBehaviour
+    whitelist:
+      components:
+      - Devourer
+  - type: NpcFactionMember
+    factions:
+    - GoblinbaneProvokedFaction
+  - type: Bloodstream
+    bloodReagent: Mopwata
+    chemicalMaxVolume: 100
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _NF/Mobs/Meme/goblinbane.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: mop_alive
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: mop_unshaded
+      shader: unshaded
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: mop_alive
+        BaseUnshaded: ghost_unshaded
+      Dead:
+        Base: mop_dead
+        BaseUnshaded: mop_dead_unshaded
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      50: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          AdvMopItem:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: MeleeWeapon
+    soundHit:
+      collection: Punch
+    angle: 30
+    animation: WeaponArcFist
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 6
+        Structural: 20
+  - type: MeleeChemicalInjector
+    solution: bloodstream
+    transferAmount: 10
+
+# Possessed Spray
+- type: entity
+  id: MobMemePossessedSpray
+  name: possessed spray
+  parent: [ BaseMobMemeGoblinbane, NFMobTimedDespawn120 ]
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HTN
+    rootTask:
+       task: RangedFollowerCompound
+  - type: NPCImprintingOnSpawnBehaviour
+    whitelist:
+      components:
+      - Devourer
+  - type: NpcFactionMember
+    factions:
+    - GoblinbaneProvokedFaction
+  - type: Bloodstream
+    bloodReagent: SpaceCleaner
+    chemicalMaxVolume: 50
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _NF/Mobs/Meme/goblinbane.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: spray_alive
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: spray_unshaded
+      shader: unshaded
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: spray_alive
+        BaseUnshaded: ghost_unshaded
+      Dead:
+        Base: spray_dead
+        BaseUnshaded: spray_dead_unshaded
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      50: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SprayBottleSpaceCleaner:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 2
+    rechargeSound:
+      path: /Audio/_NF/Effects/silence.ogg
+  - type: BasicEntityAmmoProvider
+    proto: SplatterChemCleaner
+    capacity: 2
+    count: 2
+  - type: Gun
+    showExamineText: false
+    fireRate: 4
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/water_spray.ogg
+
+# Possessed Bucket
+- type: entity
+  id: MobMemePossessedBucket
+  name: possessed mop bucket
+  parent: [ BaseMobMemeGoblinbane, NFMobTimedDespawn120 ]
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HTN
+    rootTask:
+       task: MeleeFollowerCompound
+  - type: NPCImprintingOnSpawnBehaviour
+    whitelist:
+      components:
+      - Devourer
+  - type: NpcFactionMember
+    factions:
+    - GoblinbaneProvokedFaction
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _NF/Mobs/Meme/goblinbane.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: bucket_alive
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: bucket_unshaded
+      shader: unshaded
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: bucket_alive
+        BaseUnshaded: bucket_unshaded
+      Dead:
+        Base: bucket_dead
+        BaseUnshaded: ""
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      50: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MopBucket:
+            min: 1
+            max: 1
+          SoapNT:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: MeleeWeapon
+    soundHit:
+      collection: Punch
+    angle: 30
+    animation: WeaponArcFist
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 6
+        Structural: 20
+
+# Mop bucket dimention portal
+- type: entity
+  id: MopBucketDimnsionPortal
+  name: mop bucket portal
+  parent:  [ MobIncorporealBase, XenoWardingTower, NFMobTimedDespawn80 ]
+  description: A portal to a mop bucket dimension. Obviously. It says so on the label at the corner.
+  components:
+  - type: NpcFactionMember
+    factions:
+    - GoblinbaneProvokedFaction
+  - type: Timer
+  - type: TimedSpawner
+    prototypes:
+    - SpawnMobMemePossessedBucket
+    chance: 1
+    intervalSeconds: 20
+    minimumEntitiesSpawned: 1
+    maximumEntitiesSpawned: 2
+  - type: Sprite
+    sprite: _NF/Mobs/Meme/goblinbane.rsi
+    layers:
+    - state: bucket_portal
+      shader: unshaded
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 90
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: gib
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 90
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: gib
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          WetFloorSign:
+            min: 1
+            max: 1
+  - type: PointLight
+    radius: 2.0
+    energy: 3.5
+    color: "yellow"
+
+- type: entity
+  id: CleanlinessDimensionPortal
+  name: cleanliness dimension portal
+  parent: MopBucketDimnsionPortal
+  description: A portal to the dimension of utter cleanliness. No goblins allowed.
+  components:
+  - type: TimedSpawner
+    prototypes:
+    - SpawnRandomPossessedJaniTool
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml
index 41d659e9197..e36935485e2 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -23,4 +23,17 @@
   # - type: ComputerBoard
     # prototype: ComputerAdvancedRadar
   # - type: ComputerTabletopBoard # Frontier
-    # prototype: ComputerTabletopAdvancedRadar # Frontier
\ No newline at end of file
+    # prototype: ComputerTabletopAdvancedRadar # Frontier
+
+# - type: entity
+  # parent: BaseComputerCircuitboard
+  # id: ShipyardComputerCircuitboard
+  # name: shipyard computer board
+  # description: A computer printed circuit board for a shipyard computer.
+  # components:
+    # - type: Sprite
+      # state: cpu_supply
+    # - type: ComputerBoard
+      # prototype: ComputerShipyard
+    # - type: ComputerTabletopBoard # Frontier
+      # prototype: ComputerTabletopShipyard # Frontier
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml
index 83a7f66cf63..b016ec162a6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml
@@ -47,3 +47,15 @@
     state: hypo
   - type: Item
     sprite: _NF/Objects/Specific/Medical/hypominilimitededition.rsi
+
+- type: entity
+  name: empty medipen
+  parent: BaseItem
+  description: A empty medipen with endless potential. Does not allow for deviation from Nanotrasen recipes.
+  id: BlankMediPen
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Medical/medipen.rsi
+    state: medipen
+  - type: Item
+    sprite: _NF/Objects/Specific/Medical/medipen.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
index 923a3a96192..adb3f457328 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
@@ -114,3 +114,61 @@
           Quantity: 200
   - type: StaticPrice # Frontier
     vendPrice: 500 # Frontier
+
+# Fuel-grade items
+- type: entity
+  parent: BaseItem
+  id: FuelPlasma
+  name: fuel-grade plasma
+  description: A rod made of desaturated plasma, suitable for fuel.
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Plasma: 2000
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi
+    layers:
+    - state: plasma
+  - type: Appearance
+  - type: StaticPrice
+    price: 0
+    vendPrice: 1200
+
+- type: entity
+  parent: BaseItem
+  id: FuelUranium
+  name: fuel-grade uranium
+  description: A rod made of semi-processed uranium, suitable for fuel. 
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Uranium: 2000
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi
+    layers:
+    - state: uranium
+  - type: Appearance
+  - type: StaticPrice
+    price: 0
+    vendPrice: 2500
+
+- type: entity
+  parent: BaseItem
+  id: FuelBananium
+  name: fuel-grade bananium
+  description: A rod made from pressed bananium peels, suitable for fuel. 
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Bananium: 2000
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi
+    layers:
+    - state: bananium
+  - type: Appearance
+  - type: StaticPrice
+    price: 0
+    vendPrice: 5000
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/chem.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/chem.yml
index 690ef01c8bc..463b755f019 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/chem.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/chem.yml
@@ -1,6 +1,5 @@
-# Syndicate Chemwarrior Projectiles
+# Base
 - type: entity
-#  parent: BaseBulletPractice
   parent: BulletWaterShot
   id: SplatterChemBase
   name: chemical splatter
@@ -38,10 +37,10 @@
   - type: Appearance
   - type: VaporVisuals
 
+# Syndicate Chemwarrior Projectiles
 - type: entity
   parent: SplatterChemBase
   id: SplatterChemPhlogNapalm
-  name: chemical splatter
   categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
@@ -62,7 +61,6 @@
 - type: entity
   parent: SplatterChemBase
   id: SplatterChemDrugs
-  name: chemical splatter
   categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
@@ -81,7 +79,6 @@
 - type: entity
   parent: SplatterChemBase
   id: SplatterChemMute
-  name: chemical splatter
   categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
@@ -100,7 +97,6 @@
 - type: entity
   parent: SplatterChemBase
   id: SplatterChemWeh
-  name: chemical splatter
   categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
@@ -117,7 +113,6 @@
 - type: entity
   parent: SplatterChemBase
   id: SplatterChemCold
-  name: chemical splatter
   categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
@@ -128,3 +123,22 @@
         reagents:
         - ReagentId: Fresium
           Quantity: 7 # needs 40u in bloodstream for special effect
+
+# Meme: Possessed Spray
+- type: entity
+  parent: SplatterChemBase
+  id: SplatterChemCleaner
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vapor:
+        maxVol: 50
+        canReact: false
+        reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 20
+        - ReagentId: SoapReagent
+          Quantity: 5
+        - ReagentId: Fresium
+          Quantity: 4
diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml
index 26793b1ff1e..576b723bc8a 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml
@@ -1,6 +1,7 @@
 # Frontier-specific contraband targets.
 # If you need multiple currency types, specify them in the actual object instead of inheriting multiple parents here.
 
+# region Class 1
 - type: entity
   id: BaseC1Contraband
   abstract: true
@@ -18,7 +19,9 @@
   components:
   - type: Contraband
     hideValues: true
+# endregion Class 1
 
+# region Class 2
 # Class 2 contraband: explosives, unregistered firearms, 
 
 # Specific parent for sensitive items (e.g. command headset, secway, secway keys) that should not be redeemed for FUCs
@@ -50,8 +53,9 @@
   - type: Contraband
     turnInValues: &noFUCs
       FrontierUplinkCoin: 0
+# endregion
 
-# Class 3 contraband ()
+# region Class 3 Objects
 - type: entity
   id: BaseC3ContrabandUnredeemable
   abstract: true
@@ -171,8 +175,9 @@
   - type: Contraband
     severity: Class3Wizard
     turnInValues: *oneFUC
+# endregion
 
-# Class 3 mobs
+# region Class 3 Mobs
 - type: entity
   parent: BaseC3Contraband
   id: BaseC3MobHuman # For people (should be sapients, humanoids)
@@ -191,6 +196,14 @@
     severity: Class3MobCreature
     hideCarryStatus: true
 
+- type: entity
+  parent: BaseC3MobCreature
+  id: BaseC3MobCreatureNoValue # For non-humanoid/non-sapient beasts
+  abstract: true
+  components:
+  - type: Contraband
+    turnInValues: *noFUCs
+
 - type: entity
   parent: BaseC3Contraband
   id: BaseC3MobConstruct # For thinking artifacts, robots, etc.
@@ -199,9 +212,9 @@
   - type: Contraband
     severity: Class3MobConstruct
     hideCarryStatus: true
+# endregion
 
-# Miscellaneous categories
-
+# region Miscellaneous
 - type: entity
   id: BasePirateTarget
   abstract: true
@@ -213,3 +226,4 @@
     turnInValues:
       Doubloon: 1
     hideCarryStatus: true
+# endregion
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/_NF/Entities/Structures/Power/Generation/portable_generator.yml
index d72f96c5894..e8731f68083 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Power/Generation/portable_generator.yml
@@ -3,8 +3,6 @@
   id: BaseGeneratorShuttle
   abstract: true
   components:
-  - type: FuelGenerator
-    on: true
   - type: Transform
     anchored: true
   - type: Physics
@@ -94,6 +92,7 @@
       radiationColor: "#00bfff"
     - type: SolidFuelGeneratorAdapter
       fuelMaterial: Bananium
+      ejectedFuelProtoId: FuelBananium
     - type: MaterialStorage
       materialWhiteList: [Bananium]
     - type: PowerMonitoringDevice
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/aberrant_flesh.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/aberrant_flesh.yml
index 980b0518f8f..5f2b717d27c 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/aberrant_flesh.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/aberrant_flesh.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: AberrantFleshDigestiveSack
   name: assimilation sack
   description: Huh, an assimilation sack? How do I even know this?
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/argocyte.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/argocyte.yml
index b833ad471b0..fe3166fdc64 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/argocyte.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/argocyte.yml
@@ -1,6 +1,6 @@
 # Salvage expedition objective
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: ArgocyteEgg
   name: argocyte egg
   description: Looks more like a fossil than egg.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml
index 00cb4380207..c9f245d7984 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml
@@ -211,7 +211,7 @@
 
 # Props and decoration
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: BloodCultProp01
   name: curious object
   description: Huh, I wonder what this thing is and what does it do.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/dinosaurs.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/dinosaurs.yml
index 70dca534271..fcba6315c49 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/dinosaurs.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/dinosaurs.yml
@@ -1,6 +1,6 @@
 # Salvage expedition objective
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: DinosaurEgg
   name: dinosaur egg
   description: Looks more like a fossil than egg.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/explorers.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/explorers.yml
index 13da314ea0e..a9abab5377e 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/explorers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/explorers.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: ExplorersLootRadar
   name: salvage radar
   description: Essential tool for any looter.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/mercenaries.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/mercenaries.yml
index 09e6c8c9cf6..1a611bdda7a 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/mercenaries.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/mercenaries.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: MercenaryCounterfeitCache
   name: counterfeit cache
   description: "Cache with counterfeit spesos, bootleg movie posters."
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
index e74c78e8102..9e1d6af78ed 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
@@ -1,6 +1,6 @@
 # Salvage expedition objective
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: PunkPartySupplies
   name: party supply stash
   description: The only thing that can hold a gang together.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/roguesilicons.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/roguesilicons.yml
index f085fcf0331..73e83c34737 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/roguesilicons.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/roguesilicons.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: RogueAiNode
   name: rogue ai node
   description: "Contains portion of rogue AI database."
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/syndicate.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/syndicate.yml
index e6cf821a2cf..00bbd074efe 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/syndicate.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/syndicate.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: CarpStatue
+  parent: XenoWardingTower
   id: CybersunDataMiner
   name: cybersun dataminer
   description: Data collecting and processing machine produced by Cybersun.
diff --git a/Resources/Prototypes/_NF/NPCs/mobs.yml b/Resources/Prototypes/_NF/NPCs/mobs.yml
new file mode 100644
index 00000000000..458ebf946d8
--- /dev/null
+++ b/Resources/Prototypes/_NF/NPCs/mobs.yml
@@ -0,0 +1,26 @@
+
+- type: htnCompound
+  id: MeleeFollowerCompound
+  branches:
+    - tasks:
+        - !type:HTNCompoundTask
+          task: MeleeCombatCompound
+    - tasks:
+        - !type:HTNCompoundTask
+          task: FollowCompound
+    - tasks:
+        - !type:HTNCompoundTask
+          task: IdleCompound
+
+- type: htnCompound
+  id: RangedFollowerCompound
+  branches:
+    - tasks:
+        - !type:HTNCompoundTask
+          task: InnateRangedCombatCompound
+    - tasks:
+        - !type:HTNCompoundTask
+          task: FollowCompound
+    - tasks:
+        - !type:HTNCompoundTask
+          task: IdleCompound
diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml
new file mode 100644
index 00000000000..e64754b855e
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml
@@ -0,0 +1,121 @@
+  #pen recycling recipes
+
+- type: microwaveMealRecipe
+  id: RecipeCleanEmergencyMedipen
+  name: sterilize and reset pen
+  result: BlankMediPen
+  time: 10
+  solids:
+    EmergencyMedipen: 1
+  reagents:
+    SpaceCleaner: 1
+  recipeType: MedicalAssembler # Frontier
+
+- type: microwaveMealRecipe
+  id: RecipeCleanAntiPoisonMedipen
+  name: sterilize and reset pen
+  result: BlankMediPen
+  time: 10
+  solids:
+    AntiPoisonMedipen: 1
+  reagents:
+    SpaceCleaner: 5
+  recipeType: MedicalAssembler # Frontier
+
+- type: microwaveMealRecipe
+  id: RecipeCleanBruteAutoInjector
+  name: sterilize and reset pen
+  result: BlankMediPen
+  time: 10
+  solids:
+    BruteAutoInjector: 1
+  reagents:
+    SpaceCleaner: 5
+  recipeType: MedicalAssembler # Frontier
+
+- type: microwaveMealRecipe
+  id: RecipeCleanBurnAutoInjector
+  name: sterilize and reset pen
+  result: BlankMediPen
+  time: 10
+  solids:
+    BurnAutoInjector: 1
+  reagents:
+    SpaceCleaner: 5
+  recipeType: MedicalAssembler # Frontier
+
+- type: microwaveMealRecipe
+  id: RecipeCleanRadAutoInjector
+  name: sterilize and reset pen
+  result: BlankMediPen
+  time: 10
+  solids:
+    RadAutoInjector: 1
+  reagents:
+    SpaceCleaner: 5
+  recipeType: MedicalAssembler # Frontier
+
+  #pen recipes
+  #Upstream recipes
+
+- type: microwaveMealRecipe
+  id: RecipeEmergencyMedipen
+  name: emergency medipen
+  result: EmergencyMedipen
+  time: 10
+  solids:
+    BlankMediPen: 1
+  reagents:
+    Epinephrine: 12
+    TranexamicAcid: 3
+  recipeType: MedicalAssembler # Frontier
+
+- type: microwaveMealRecipe
+  id: RecipeAntiPoisonMedipen
+  name: poison auto-injector
+  result: AntiPoisonMedipen
+  time: 10
+  solids:
+    BlankMediPen: 1
+  reagents:
+    Ultravasculine: 10
+    Epinephrine: 5
+  recipeType: MedicalAssembler # Frontier
+
+- type: microwaveMealRecipe
+  id: RecipeBruteAutoInjector
+  name: brute auto-injector
+  result: BruteAutoInjector
+  time: 10
+  solids:
+    BlankMediPen: 1
+  reagents:
+    Bicaridine: 15
+    TranexamicAcid: 5
+  recipeType: MedicalAssembler # Frontier
+
+- type: microwaveMealRecipe
+  id: RecipeBurnAutoInjector
+  name: burn auto-injector
+  result: BurnAutoInjector
+  time: 10
+  solids:
+    BlankMediPen: 1
+  reagents:
+    Dermaline: 10
+    Leporazine: 10
+  recipeType: MedicalAssembler # Frontier
+
+- type: microwaveMealRecipe
+  id: RecipeRadAutoInjector
+  name: rad auto-injector
+  result: RadAutoInjector
+  time: 10
+  solids:
+    BlankMediPen: 1
+  reagents:
+    Arithrazine: 15
+    Bicaridine: 5
+  recipeType: MedicalAssembler # Frontier
+
+#Frontier pen recipes
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml
index 821ba3bc9e3..afd1f18c1a2 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml
@@ -15,3 +15,11 @@
     Plasma: 15
     Silver: 15
     Bluespace: 30 #DeltaV: Bluespace
+
+- type: latheRecipe
+  id: BlankMediPen
+  result: BlankMediPen
+  completetime: 2
+  materials:    
+    Plastic: 50
+    Steel: 25
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml
index f92a7e90e73..0f39fb0ea03 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml
@@ -12,7 +12,7 @@
   id: Broadhead
   name: NSF Broadhead
   description: A medium size detective ship with facilities for autopsies, interrogations and detailed investigations.
-  price: 50000 #Appraises at 46495 and added markup of ~8% - TODO: fix these values, getting tests to pass - Whatstone
+  price: 60000 # TODO: fix these values, getting tests to pass - Whatstone
   category: Medium
   group: Security
   access: Detective
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
index 2aee91db4f9..3f854549638 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
@@ -2,7 +2,7 @@
   id: Inquisitor
   name: NSF Inquisitor
   description: A small detective-oriented ship with two cells for holding prisoners
-  price: 29000
+  price: 30000
   category: Small
   group: Security
   access: Detective
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
index 44ef9fccdcf..c96e0bd6946 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
@@ -2,7 +2,7 @@
   id: Orange
   name: SV Orange
   description: A cargo slash salvage shuttle made from scavenged wrecks, comes with some damage.
-  price: 17000 #Appraisal is 15800, +5% margin - TODO: fix this value, getting tests to pass - Whatstone
+  price: 18000 #Appraisal is 15800, +5% margin - TODO: fix this value, getting tests to pass - Whatstone
   category: Small
   group: Scrap
   shuttlePath: /Maps/_NF/Shuttles/Scrap/orange.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml
index ca0052347aa..0850b7c93e8 100644
--- a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml
@@ -13,7 +13,7 @@
   id: Chauffeur
   name: NC Chauffeur
   description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology.
-  price: 15500 # $14325 after appraisal + ~$1200 (~5% markup) - TODO: fix this value, getting tests to pass - Whatstone
+  price: 16500 # $14325 after appraisal + ~$1200 (~5% markup) - TODO: fix this value, getting tests to pass - Whatstone
   category: Small
   group: Sr
   access: Service
diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml
index 1c122bc8831..d23343683a5 100644
--- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml
@@ -12,7 +12,7 @@
   id: Bookworm
   name: SBB Bookworm
   description: A cozy medium-size library for travellers who wish to relax with a book or perhaps a board game.
-  price: 27000 # ~24660 after purchase + ~9% markup
+  price: 30000 # ~24660 after purchase + ~9% markup
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/bookworm.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
index 9795058c879..56fcf5b365a 100644
--- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml
+++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
@@ -1,8 +1,8 @@
 - type: vessel
-  id: caduceus
+  id: Caduceus
   name: NM Caduceus
   description: A former humanitarian vessel, the Caduceus now works as the best mobile hospital money can buy.
-  price: 110000 # Appraises at 101889, ~9% margin - TODO: fix this value, getting tests to pass - Whatstone
+  price: 115000 # Appraises at 101889, ~9% margin - TODO: fix this value, getting tests to pass - Whatstone
   category: Large
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/caduceus.yml
@@ -12,12 +12,12 @@
   - Chemistry
 
 - type: gameMap
-  id: caduceus
+  id: Caduceus
   mapName: 'NM Caduceus'
   mapPath: /Maps/_NF/Shuttles/caduceus.yml
   minPlayers: 0
   stations:
-    caduceus:
+    Caduceus:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml
index 28d56a60451..c726475ca83 100644
--- a/Resources/Prototypes/_NF/Shipyard/ceres.yml
+++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml
@@ -12,7 +12,7 @@
   id: Ceres
   name: SBB Ceres
   description: A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests
-  price: 56000 # ~5% markup - TODO: fix this value, just getting tests to pass - Whatstone
+  price: 60000 # ~5% markup - TODO: fix this value, just getting tests to pass - Whatstone
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/ceres.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml
index c087f0e0df9..a8be30f7588 100644
--- a/Resources/Prototypes/_NF/Shipyard/garden.yml
+++ b/Resources/Prototypes/_NF/Shipyard/garden.yml
@@ -12,7 +12,7 @@
   id: Garden
   name: HS Garden
   description: A small botany vessel dedicated to horiticultural experimentation.
-  price: 24750
+  price: 26000
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/garden.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml
index 2cef0f4f898..98a2f657ac2 100644
--- a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml
+++ b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml
@@ -9,10 +9,10 @@
 # Shuttle Notes:
 # 
 - type: vessel
-  id: kilderkin
+  id: Kilderkin
   name: LVHI Kilderkin
   description: "Spaceworthy bar/microbrewery with everything one needs to facilitate poor life choices: lots of booze, smokes, and lack of food. Manufactured by Langstad-Voigt Heavy Industries."
-  price: 45500 # ~39600$ on mapinit + ~5950$ from 15% markup
+  price: 47000 # ~39600$ on mapinit + ~5950$ from 15% markup
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/kilderkin.yml
@@ -21,12 +21,12 @@
   - Civilian
 
 - type: gameMap
-  id: kilderkin
+  id: Kilderkin
   mapName: 'Kilderkin'
   mapPath: /Maps/_NF/Shuttles/kilderkin.yml
   minPlayers: 0
   stations:
-    kilderkin:
+    Kilderkin:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
diff --git a/Resources/Prototypes/_NF/Shipyard/lantern.yml b/Resources/Prototypes/_NF/Shipyard/lantern.yml
index 3cf4aba934f..614dc936bcd 100644
--- a/Resources/Prototypes/_NF/Shipyard/lantern.yml
+++ b/Resources/Prototypes/_NF/Shipyard/lantern.yml
@@ -9,10 +9,10 @@
 # Shuttle Notes:
 #
 - type: vessel
-  id: lantern
+  id: Lantern
   name: LVHI Lantern
   description: The Lantern is a medium-sized chapel-vessel equipped with everything chaplain might need in their never ending battle for salvation of NT personnel souls. Manufactured by Langstad-Voigt Heavy Industries.
-  price: 32100 # ~27900$ on mapinit + ~4200$ from 10% markup
+  price: 34000 # ~27900$ on mapinit + ~4200$ from 10% markup
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/lantern.yml
@@ -21,12 +21,12 @@
   - Civilian
 
 - type: gameMap
-  id: lantern
+  id: Lantern
   mapName: 'Lantern'
   mapPath: /Maps/_NF/Shuttles/lantern.yml
   minPlayers: 0
   stations:
-    lantern:
+    Lantern:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml
index 94b7c453c13..19f44fe89a2 100644
--- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml
@@ -9,7 +9,7 @@
   id: McCargo
   name: DC McCargo
   description: "Your very own McCargo™ franchise! Comes fully stocked and ready for production of McMeals."
-  price: 72000 # appraises at 67456, ~10% margin - TODO: fix these values, getting tests to pass - Whatstone
+  price: 75000 # appraises at 67456, ~10% margin - TODO: fix these values, getting tests to pass - Whatstone
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/mccargo.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml
index 629aefb3f1f..e4f7ee0b0c8 100644
--- a/Resources/Prototypes/_NF/Shipyard/pts.yml
+++ b/Resources/Prototypes/_NF/Shipyard/pts.yml
@@ -12,7 +12,7 @@
   id: PTS
   name: NC Personal Transport
   description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology.
-  price: 15500 # $14325 after appraisal + $1200 (~5% markup)
+  price: 16500 # $14325 after appraisal + $1200 (~5% markup)
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/pts.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/spirit.yml b/Resources/Prototypes/_NF/Shipyard/spirit.yml
index ae7dfd0ed5c..aa792192836 100644
--- a/Resources/Prototypes/_NF/Shipyard/spirit.yml
+++ b/Resources/Prototypes/_NF/Shipyard/spirit.yml
@@ -12,7 +12,7 @@
   id: Spirit
   name: FSB Spirit
   description: A tiny medical search and rescue shuttle, as nimble as it is cramped. Running costs guarenteed* to be 5% lower than competing models!
-  price: 15500
+  price: 16500
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/spirit.yml
diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml
index 5c8dea137bf..e1b8d947be5 100644
--- a/Resources/Prototypes/_NF/ai_factions.yml
+++ b/Resources/Prototypes/_NF/ai_factions.yml
@@ -24,6 +24,10 @@
   - SiliconsExpeditionNF
   - AberrantFleshExpeditionNF
   - ContrabandClothing
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  #- ChaplainClothes
 
 - type: npcFaction
   id: Dwarf
@@ -77,6 +81,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: WizFedFaction
@@ -107,6 +115,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  #- GoblinbaneFaction
+  #- GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: BloodCultNF
@@ -137,6 +149,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: PirateNF
@@ -167,6 +183,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: ArtifactConstruct
@@ -197,6 +217,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  #- GoblinbaneFaction # Magic
+  #- GoblinbaneProvokedFaction # Magic
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: StreetGangNF
@@ -227,6 +251,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: DinosaursNF
@@ -257,6 +285,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: ExplorersExpeditionNF
@@ -287,6 +319,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: MercenariesExpeditionNF
@@ -317,6 +353,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: SiliconsExpeditionNF
@@ -347,6 +387,10 @@
   - AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: AberrantFleshExpeditionNF
@@ -377,6 +421,10 @@
   #- AberrantFleshExpeditionNF
   - ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: ContrabandClothing
@@ -407,6 +455,10 @@
   - AberrantFleshExpeditionNF
   #- ContrabandClothing
   - ContrabandDetection
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
 
 - type: npcFaction
   id: ContrabandDetection
@@ -436,6 +488,10 @@
   - SiliconsExpeditionNF
   - AberrantFleshExpeditionNF
   - ContrabandClothing
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  #- JanitorClothes
+  #- ChaplainClothes
 
 - type: npcFaction
   id: HostileUniversally
@@ -465,3 +521,66 @@
   - SiliconsExpeditionNF
   - AberrantFleshExpeditionNF
   - ContrabandClothing
+  - GoblinbaneFaction
+  - GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
+
+- type: npcFaction
+  id: GoblinbaneFaction
+  friendly:
+  - GoblinbaneProvokedFaction
+  - WizFedFaction
+  - JanitorClothes
+  hostile:
+  - PetsNT
+  - Pibble
+  - Mouse
+  - Zombie
+  ## Frontier Factions
+  - Felinid
+  - Monkey
+  - Goblin
+  - ChaplainClothes
+
+- type: npcFaction
+  id: GoblinbaneProvokedFaction
+  friendly:
+  - GoblinbaneFaction
+  hostile:
+  ## SS14 factions
+  - NanoTrasen
+  - Syndicate
+  - SimpleHostile
+  - SimpleNeutral
+  - Passive
+  - PetsNT
+  - Zombie
+  - Revolutionary
+  - Xeno
+  ## Frontier Factions
+  - Felinid
+  - Monkey
+  - Goblin
+  - SyndicateNF
+  - WizFedFaction
+  - BloodCultNF
+  - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
+  - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
+  - ContrabandClothing
+  #- GoblinbaneFaction
+  #- GoblinbaneProvokedFaction
+  - JanitorClothes
+  - ChaplainClothes
+
+- type: npcFaction
+  id: JanitorClothes
+
+- type: npcFaction
+  id: ChaplainClothes
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/alive.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/alive.png
new file mode 100644
index 00000000000..024ddf0952b
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/alive.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/alive_unshaded.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/alive_unshaded.png
new file mode 100644
index 00000000000..309a0f06ed8
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/alive_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_alive.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_alive.png
new file mode 100644
index 00000000000..f9ec2918739
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_alive.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_dead.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_dead.png
new file mode 100644
index 00000000000..69ebcf46b2b
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_dead.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_portal.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_portal.png
new file mode 100644
index 00000000000..da41f59bf7c
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_portal.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_unshaded.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_unshaded.png
new file mode 100644
index 00000000000..288bc505ff7
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/bucket_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/dead.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/dead.png
new file mode 100644
index 00000000000..26f74df7a29
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/dead.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/dead_unshaded.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/dead_unshaded.png
new file mode 100644
index 00000000000..2e87f6e6327
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/dead_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/ghost.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/ghost.png
new file mode 100644
index 00000000000..3ffbc59be75
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/ghost.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/ghost_unshaded.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/ghost_unshaded.png
new file mode 100644
index 00000000000..55c8f22b5c1
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/ghost_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/meta.json b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/meta.json
new file mode 100644
index 00000000000..795192db429
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/meta.json
@@ -0,0 +1,111 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Original toilet sprite made by brainfood1183 (github) for ss14, bashed with other sprites and animated by erhardsteinhauer (github/discord)",
+    "states": [
+        {
+            "name": "dead"
+        },
+        {
+            "name": "dead_unshaded"
+        },
+        {
+            "name": "alive",
+            "directions": 4,
+            "delays":
+			[
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        },
+        {
+            "name": "alive_unshaded",
+            "directions": 4,
+            "delays":
+			[
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        },
+        {
+            "name": "ghost",
+            "directions": 4,
+            "delays":
+			[
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        },
+        {
+            "name": "ghost_unshaded",
+            "directions": 4,
+            "delays":
+			[
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        },
+        {
+            "name": "mop_alive",
+            "delays":
+			[ [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+        },
+        {
+            "name": "mop_unshaded",
+            "delays":
+			[ [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+        },
+        {
+            "name": "mop_dead"
+        },
+        {
+            "name": "mop_dead_unshaded"
+        },
+        {
+            "name": "spray_alive",
+            "delays":
+			[ [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+        },
+        {
+            "name": "spray_unshaded",
+            "delays":
+			[ [ 0.2, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+        },
+        {
+            "name": "spray_dead"
+        },
+        {
+            "name": "spray_dead_unshaded"
+        },
+        {
+            "name": "bucket_alive",
+            "delays":
+			[ [ 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 ] ]
+        },
+        {
+            "name": "bucket_unshaded",
+            "delays":
+			[ [ 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 ] ]
+        },
+        {
+            "name": "bucket_dead"
+        },
+        {
+            "name": "bucket_portal",
+            "delays":
+			[ [ 0.2, 0.2, 0.2 ] ]
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_alive.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_alive.png
new file mode 100644
index 00000000000..4fe53b51671
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_alive.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_dead.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_dead.png
new file mode 100644
index 00000000000..02a1175846a
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_dead.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_dead_unshaded.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_dead_unshaded.png
new file mode 100644
index 00000000000..2a8685e8764
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_dead_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_unshaded.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_unshaded.png
new file mode 100644
index 00000000000..13c3f430e19
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/mop_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_alive.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_alive.png
new file mode 100644
index 00000000000..16cd6ef8994
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_alive.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_dead.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_dead.png
new file mode 100644
index 00000000000..544611976bc
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_dead.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_dead_unshaded.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_dead_unshaded.png
new file mode 100644
index 00000000000..dc9f4cd9274
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_dead_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_unshaded.png b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_unshaded.png
new file mode 100644
index 00000000000..feafcdb8b18
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Meme/goblinbane.rsi/spray_unshaded.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png
new file mode 100644
index 00000000000..96360749fd5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json
new file mode 100644
index 00000000000..21b63619775
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "copyright": "Made by Whatstone based sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+    "license": "CC-BY-SA-3.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "bananium"
+        },
+        {
+            "name": "plasma"
+        },
+        {
+            "name": "uranium"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png
new file mode 100644
index 00000000000..6a040497614
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png
new file mode 100644
index 00000000000..82e3f5c5679
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png
new file mode 100644
index 00000000000..993468f79b2
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png
new file mode 100644
index 00000000000..9b62a31f1f8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen.png
new file mode 100644
index 00000000000..75f472fd125
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/medipen.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/meta.json
new file mode 100644
index 00000000000..b1b80617201
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "medipen"
+    },
+	{
+      "name": "medipen-inhand-left"
+    },
+    {
+      "name": "medipen-inhand-right"
+    }
+  ]
+}