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/_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
index 9adfc94cd66..044a1267788 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml
@@ -21,9 +21,8 @@
         layer:
         - Opaque
 
-# Possessed Toilet
 - type: entity
-  id: MobMemeGoblinbane
+  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.
@@ -150,6 +149,14 @@
     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
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
index e2905588ac0..644b03da42b 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml
@@ -2,7 +2,7 @@
 - type: entity
   id: MobMemePossessedMop
   name: possessed mop
-  parent: [ MobIncorporealBase, MobMemeGoblinbane ]
+  parent: [ MobIncorporealBase, BaseMobMemeGoblinbane, NFMobTimedDespawn120 ]
   categories: [ HideSpawnMenu ]
   components:
   - type: HTN
@@ -68,14 +68,12 @@
   - type: MeleeChemicalInjector
     solution: bloodstream
     transferAmount: 10
-  - type: TimedDespawn
-    lifetime: 120
 
 # Possessed Spray
 - type: entity
   id: MobMemePossessedSpray
   name: possessed spray
-  parent: MobMemeGoblinbane
+  parent: [ BaseMobMemeGoblinbane, NFMobTimedDespawn120 ]
   categories: [ HideSpawnMenu ]
   components:
   - type: HTN
@@ -143,14 +141,12 @@
     availableModes:
     - SemiAuto
     soundGunshot: /Audio/Weapons/Guns/Gunshots/water_spray.ogg
-  - type: TimedDespawn
-    lifetime: 120
 
 # Possessed Bucket
 - type: entity
   id: MobMemePossessedBucket
   name: possessed mop bucket
-  parent: [ MobMemeGoblinbane ]
+  parent: [ BaseMobMemeGoblinbane, NFMobTimedDespawn120 ]
   categories: [ HideSpawnMenu ]
   components:
   - type: HTN
@@ -213,14 +209,12 @@
       types:
         Blunt: 6
         Structural: 20
-  - type: TimedDespawn
-    lifetime: 120
 
 # Mop bucket dimention portal
 - type: entity
   id: MopBucketDimnsionPortal
   name: mop bucket portal
-  parent:  [ MobIncorporealBase, XenoWardingTower ]
+  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
@@ -268,8 +262,6 @@
     radius: 2.0
     energy: 3.5
     color: "yellow"
-  - type: TimedDespawn
-    lifetime: 80
 
 - type: entity
   id: CleanlinessDimensionPortal
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