Merge branch 'master' into 2025-01-10-LobbyMusic

new-frontiers-14 · Jan 10, 2025 · aebe407 · aebe407
2 parents fb6ad98 + 709d121
commit aebe407
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git 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'
diff --git 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

diff --git 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

diff --git 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
@@ -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: []