diff --git a/Resources/Locale/en-US/_NF/accent/caveman.ftl b/Resources/Locale/en-US/_NF/accent/caveman.ftl
index d9b48fa123b..4fcbda05f89 100644
--- a/Resources/Locale/en-US/_NF/accent/caveman.ftl
+++ b/Resources/Locale/en-US/_NF/accent/caveman.ftl
@@ -6,16 +6,15 @@ accent-caveman-forbidden-4 = at
 accent-caveman-forbidden-5 = am
 accent-caveman-forbidden-6 = as
 accent-caveman-forbidden-7 = is
-accent-caveman-forbidden-8 = it
-accent-caveman-forbidden-9 = do
-accent-caveman-forbidden-10 = does
-accent-caveman-forbidden-11 = did
-accent-caveman-forbidden-12 = just
-accent-caveman-forbidden-13 = are
-accent-caveman-forbidden-14 = was
-accent-caveman-forbidden-15 = the
-accent-caveman-forbidden-16 = it's
-accent-caveman-forbidden-17 = its
+accent-caveman-forbidden-8 = do
+accent-caveman-forbidden-9 = does
+accent-caveman-forbidden-10 = did
+accent-caveman-forbidden-11 = just
+accent-caveman-forbidden-12 = are
+accent-caveman-forbidden-13 = was
+accent-caveman-forbidden-14 = the
+accent-caveman-forbidden-15 = it's
+accent-caveman-forbidden-16 = its
 accent-caveman-forbidden-empty = {""}
 
 accent-caveman-numbers-0 = no
diff --git a/Resources/Locale/en-US/_NF/medical/medicine.ftl b/Resources/Locale/en-US/_NF/medical/medicine.ftl
new file mode 100644
index 00000000000..748cc5415cd
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/medical/medicine.ftl
@@ -0,0 +1 @@
+medicine-label-mannitol-clarpy = Clarpy's dementia pills
diff --git a/Resources/Locale/en-US/_NF/reagents/meta/narcotics.ftl b/Resources/Locale/en-US/_NF/reagents/meta/narcotics.ftl
index 20bf64bcc81..701a033110e 100644
--- a/Resources/Locale/en-US/_NF/reagents/meta/narcotics.ftl
+++ b/Resources/Locale/en-US/_NF/reagents/meta/narcotics.ftl
@@ -3,3 +3,6 @@ reagent-desc-rock-dust = A blend of finely pulverized rock minerals suspended in
 
 reagent-name-shroom-mix = shroom mix
 reagent-desc-shroom-mix = A blend of cut, chewed and ground partially dried shrooms, suspended in mopwata.
+
+# Missing upstream definition
+reagent-name-hyperzine = hyperzine
diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml
index 1e942244192..9b4abe55df6 100644
--- a/Resources/Maps/_NF/POI/cove.yml
+++ b/Resources/Maps/_NF/POI/cove.yml
@@ -25,6 +25,7 @@ entities:
     components:
     - type: MetaData
     - type: Transform
+      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -4955,31 +4956,11 @@ entities:
     - type: Transform
       pos: -0.5,16.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        ShipyardConsole-targetId: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 1959
     components:
     - type: Transform
       pos: -3.5,16.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        ShipyardConsole-targetId: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: ComputerTabletopIFFPOI
   entities:
   - uid: 1920
@@ -5015,18 +4996,6 @@ entities:
     - type: Transform
       pos: 5.5,2.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        bank-ATM-cashSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-    - type: Physics
-      canCollide: False
 - proto: ContrabandPalletPirate
   entities:
   - uid: 229
@@ -5233,7 +5202,7 @@ entities:
   - uid: 2057
     components:
     - type: Transform
-      pos: -0.37870407,2.5181322
+      pos: -0.345032,2.4970655
       parent: 1
 - proto: DisposalBend
   entities:
@@ -5650,28 +5619,16 @@ entities:
     - type: Transform
       pos: -3.015983,26.135101
       parent: 1
-    - type: ItemSlots
-    - type: ContainerContainer
-      containers:
-        paper_label: !type:ContainerSlot {}
   - uid: 1113
     components:
     - type: Transform
       pos: -3.3076496,25.978851
       parent: 1
-    - type: ItemSlots
-    - type: ContainerContainer
-      containers:
-        paper_label: !type:ContainerSlot {}
   - uid: 1116
     components:
     - type: Transform
       pos: 2.508083,11.4275875
       parent: 1
-    - type: ItemSlots
-    - type: ContainerContainer
-      containers:
-        paper_label: !type:ContainerSlot {}
 - proto: DrinkPremiumRumBottleFull
   entities:
   - uid: 1600
@@ -5899,9 +5856,6 @@ entities:
     - type: Transform
       pos: 7.5,28.5
       parent: 1
-    - type: Door
-      secondsUntilStateChange: -7306.7144
-      state: Opening
 - proto: FenceWoodSmallCorner
   entities:
   - uid: 1763
@@ -7021,6 +6975,30 @@ entities:
     - type: Transform
       pos: 2.4660487,-4.2594047
       parent: 1
+- proto: FuelPlasma
+  entities:
+  - uid: 668
+    components:
+    - type: Transform
+      pos: -2.5992656,13.75297
+      parent: 1
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -2.3700988,13.648731
+      parent: 1
+- proto: FuelUranium
+  entities:
+  - uid: 670
+    components:
+    - type: Transform
+      pos: -1.3180155,13.648731
+      parent: 1
+  - uid: 672
+    components:
+    - type: Transform
+      pos: -1.5471821,13.75297
+      parent: 1
 - proto: GasMixerOnFlipped
   entities:
   - uid: 901
@@ -7837,13 +7815,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,5.5
       parent: 1
-- proto: SyndicateKitchenElectricRange
-  entities:
-  - uid: 774
-    components:
-    - type: Transform
-      pos: 0.5,7.5
-      parent: 1
 - proto: KitchenKnife
   entities:
   - uid: 234
@@ -7985,6 +7956,13 @@ entities:
     - type: Transform
       pos: 2.5104294,-0.96410155
       parent: 1
+- proto: NFPillCanisterMannitol
+  entities:
+  - uid: 1911
+    components:
+    - type: Transform
+      pos: -1.4936128,-1.4300365
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 2035
@@ -8179,10 +8157,6 @@ entities:
     - type: Transform
       pos: 9.5,17.5
       parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
 - proto: PortableScrubber
   entities:
   - uid: 9
@@ -9208,33 +9182,6 @@ entities:
     - type: Transform
       pos: -6.5,5.5
       parent: 1
-- proto: SheetPlasma
-  entities:
-  - uid: 668
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.610289,13.663282
-      parent: 1
-  - uid: 669
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.3394558,13.652866
-      parent: 1
-- proto: SheetUranium
-  entities:
-  - uid: 670
-    components:
-    - type: Transform
-      pos: -1.7080126,13.6587715
-      parent: 1
-  - uid: 672
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.2977891,13.652866
-      parent: 1
 - proto: Shovel
   entities:
   - uid: 1126
@@ -9757,6 +9704,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.4595704,36.201065
       parent: 1
+- proto: SyndicateKitchenElectricRange
+  entities:
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
 - proto: SyndicateMicrowave
   entities:
   - uid: 149
diff --git a/Resources/Prototypes/_NF/Accents/word_replacements.yml b/Resources/Prototypes/_NF/Accents/word_replacements.yml
index 96e1c78d1bd..95d4adbd508 100644
--- a/Resources/Prototypes/_NF/Accents/word_replacements.yml
+++ b/Resources/Prototypes/_NF/Accents/word_replacements.yml
@@ -938,4 +938,3 @@
     accent-caveman-forbidden-14: accent-caveman-forbidden-empty
     accent-caveman-forbidden-15: accent-caveman-forbidden-empty
     accent-caveman-forbidden-16: accent-caveman-forbidden-empty
-    accent-caveman-forbidden-17: accent-caveman-forbidden-empty
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/baby_dragon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/baby_dragon.yml
index b9c444af60d..bd59c4aa8cb 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/baby_dragon.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/baby_dragon.yml
@@ -52,7 +52,6 @@
   - type: FloatingVisuals
   - type: NpcFactionMember
     factions:
-    - Dragon
     - PetsNT
   - type: Speech
     speechVerb: SmallMob
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
index 711d2dc5055..a42e580a398 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
@@ -87,6 +87,12 @@
       - Cat
       - PirateNF
   - type: CargoSellBlacklist
+  - type: PirateAccent
+  - type: Speech
+    audioParams:
+      volume: -2
+      rolloffFactor: 4.5
+      pitch: 0.7
 
 - type: entity
   name: Cappy
@@ -136,7 +142,7 @@
   - type: NpcFactionMember
     factions:
       - Cat
-      - PetsNT
+      - NanoTrasen
   - type: Speech
     speechSounds: NfsdCat
     speechVerb: SmallMob
@@ -151,6 +157,7 @@
   - type: CargoSellBlacklist
   - type: PirateBountyItem
     id: Cappy
+  - type: SouthernAccent
 
 - type: entity
   name: Clugg
@@ -176,12 +183,12 @@
     nameSegments: [names_cat_clugg]
   - type: NpcFactionMember
     factions:
-      - Cat
-      - DinosaursNF
+      - Cat # Everybody loves Clugg. Maybe not pitbulls.
   - type: NFSalvageMobRestrictions
     despawnIfOffLinkedGrid: false
     addComponentsOnDeath: []
     removeComponentsOnDeath: []
+  - type: CavemanAccent
 
 - type: entity
   name: Mistake
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/healing.yml
index f2c5242b105..405b90e49b3 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/healing.yml
@@ -14,4 +14,37 @@
   components:
   - type: Stack
     lingering: true
-    count: 10
\ No newline at end of file
+    count: 10
+
+- type: entity
+  parent: PillCanister
+  id: NFPillCanisterMannitol
+  suffix: Mannitol 10u, 10, Clarpy
+  description: Take two pills daily.
+  components:
+  - type: Label
+    currentLabel: medicine-label-mannitol-clarpy
+  - type: StorageFill
+    contents:
+    - id: NFPillMannitol
+      amount: 10
+
+- type: entity
+  name: pill
+  suffix: Mannitol 10u
+  parent: Pill
+  id: NFPillMannitol
+  components:
+  - type: Pill
+    pillType: 13
+  - type: Sprite
+    state: pill14
+  - type: Label
+    currentLabel: mannitol 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Mannitol
+          Quantity: 10
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
index 97d7e984b74..0ba9f4c9792 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
@@ -26,6 +26,9 @@
     - type: MailDisabled
     - type: SpecialSectorStationRecord
       recordGeneration: FalseRecord
+    - type: NpcFactionMember
+      factions:
+      - PirateNF
   - !type:AddImplantSpecial
     implants: [ FreelanceTrackingImplant ]
   - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake.
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
index 4cb7019947c..da729008102 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
@@ -27,6 +27,9 @@
     - type: MailDisabled
     - type: SpecialSectorStationRecord
       recordGeneration: FalseRecord
+    - type: NpcFactionMember
+      factions:
+      - PirateNF
   - !type:AddImplantSpecial
     implants: [ FreelanceTrackingImplant ]
   - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake.
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
index 95c7ca8c305..1ef6318ef2d 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
@@ -27,6 +27,9 @@
     - type: MailDisabled
     - type: SpecialSectorStationRecord
       recordGeneration: FalseRecord
+    - type: NpcFactionMember
+      factions:
+      - PirateNF
   - !type:AddImplantSpecial
     implants: [ FreelanceTrackingImplant ]
   - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake.
diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml
index 5c8dea137bf..730cd03888d 100644
--- a/Resources/Prototypes/_NF/ai_factions.yml
+++ b/Resources/Prototypes/_NF/ai_factions.yml
@@ -36,6 +36,8 @@
 
 - type: npcFaction
   id: Cat
+  hostile:
+  - Mouse
 
 - type: npcFaction
   id: Chicken
@@ -165,7 +167,7 @@
   - MercenariesExpeditionNF
   - SiliconsExpeditionNF
   - AberrantFleshExpeditionNF
-  - ContrabandClothing
+  # - ContrabandClothing
   - ContrabandDetection
 
 - type: npcFaction
@@ -411,30 +413,6 @@
 - type: npcFaction
   id: ContrabandDetection
   hostile:
-  ## SS14 factions
-  #- NanoTrasen
-  - Syndicate
-  - SimpleHostile
-  #- SimpleNeutral
-  #- Passive
-  #- PetsNT
-  - Zombie
-  - Revolutionary
-  - Xeno
-  ## Frontier Factions
-  #- Monkey
-  #- Goblin
-  - SyndicateNF
-  - WizFedFaction
-  - BloodCultNF
-  - PirateNF
-  - ExplorersExpeditionNF
-  - ArtifactConstruct
-  - StreetGangNF
-  - DinosaursNF
-  - MercenariesExpeditionNF
-  - SiliconsExpeditionNF
-  - AberrantFleshExpeditionNF
   - ContrabandClothing
 
 - type: npcFaction
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index 780494df5e8..864e1acf47b 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -52,20 +52,9 @@
   id: PetsNT
   hostile:
   - Mouse
-  - SimpleHostile
-  - Zombie
-  - Xeno
-  - WizFedFaction # Frontier
-  - BloodCultNF # Frontier
-  - PirateNF # Frontier
-  - ExplorersExpeditionNF # Frontier
-  - ArtifactConstruct # Frontier
-  - StreetGangNF # Frontier
-  - DinosaursNF # Frontier
-  - MercenariesExpeditionNF # Frontier
-  - SiliconsExpeditionNF # Frontier
-  - AberrantFleshExpeditionNF # Frontier
-  - ContrabandClothing # Frontier
+  # - SimpleHostile # Frontier
+  # - Zombie # Frontier
+  # - Xeno # Frontier
 
 - type: npcFaction
   id: SimpleHostile