From 247be714357be96fda6fdca89b57809390ffbe6e Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:32:32 +0200
Subject: [PATCH 1/4] Update mob_hostile_syndicate.yml (#2671)

* Update mob_hostile_syndicate.yml

* Update silicon.yml
---
 .../_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml         | 5 +++++
 Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml      | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
index b942b4e59e0..3186f565dc5 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
@@ -485,6 +485,7 @@
   parent:
   - MobHumanoidHostileBase
   - MobHumanoidHostileAISimpleMelee
+  - NFMobRestrictions
   id: MobExperimentationVictim
   categories: [ HideSpawnMenu ]
   components:
@@ -501,6 +502,10 @@
     - type: HTN
       rootTask:
         task: SimpleHumanoidHostileCompound
+    - type: NFSalvageMobRestrictions
+      despawnIfOffLinkedGrid: false
+      addComponentsOnDeath: []
+      removeComponentsOnDeath: []
 
 # Syndicate Commander, "armed" with AK
 - type: entity
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
index d7ef2fd5e6c..a5e71d7b380 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
@@ -47,6 +47,7 @@
   parent:
   - MobCleanBot
   - BaseC3SyndicateContrabandNoValue
+  - NFMobRestrictions
   id: MobCleanBotSyndie
   name: syndicate cleanbot
   description: The creep of automation now threatening space janitors with a knife.
@@ -59,3 +60,7 @@
   - type: HTN
     rootTask:
       task: CleanbotCompound
+  - type: NFSalvageMobRestrictions
+    despawnIfOffLinkedGrid: false
+    addComponentsOnDeath: []
+    removeComponentsOnDeath: []

From d676d931c3012d6bc26766d22ffbf9893ed25b36 Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:01:17 +0200
Subject: [PATCH 2/4] Update tide.yml (#2670)

---
 Resources/Maps/_NF/Shuttles/Scrap/tide.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
index 9f46292a949..ff708046030 100644
--- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
+++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
@@ -1249,6 +1249,13 @@ entities:
     - type: Transform
       pos: 0.5,7.5
       parent: 2
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
 - proto: Stool
   entities:
   - uid: 170

From 77f51b780525669db44b7fe2622548faf8755d06 Mon Sep 17 00:00:00 2001
From: Alkheemist <alkheemist@gmail.com>
Date: Fri, 10 Jan 2025 22:01:45 +1100
Subject: [PATCH 3/4] added Goblin to list of accents accentless disables
 (#2598)

* added Goblin to list of accents accentless disables

* added frontier comments

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 Resources/Prototypes/Traits/speech.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml
index 98d0368ed6e..dca599eb1ff 100644
--- a/Resources/Prototypes/Traits/speech.yml
+++ b/Resources/Prototypes/Traits/speech.yml
@@ -9,6 +9,7 @@
   components:
   - type: Accentless
     removes:
+    - type: GoblinAccent # Frontier
     - type: LizardAccent
     - type: MothAccent
     - type: ReplacementAccent

From 709d121bed402335b66acf5c8ecff90e2a9e4147 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Fri, 10 Jan 2025 11:02:10 +0000
Subject: [PATCH 4/4] Automatic Changelog (#2598)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index fe34170bc28..b191ae2c031 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6298,3 +6298,9 @@ Entries:
       message: Dresses added to contractor loadout.
   id: 5640
   time: '2025-01-09T19:55:37.0000000+00:00'
+- author: Alkheemist
+  changes:
+    - type: Fix
+      message: Accentless now works on goblins.
+  id: 5641
+  time: '2025-01-10T11:01:45.0000000+00:00'