Merge branch 'new-frontiers-14:master' into DungeonMobsTweaks

new-frontiers-14 · Mar 28, 2024 · 870ac5c · 870ac5c
2 parents 9b1ccb1 + 21ac8d3
commit 870ac5c
Show file tree

Hide file tree

Showing 6 changed files with 3,029 additions and 1,491 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3816,3 +3816,27 @@ Entries:
         issues with sleeping for long duration.
   id: 4884
   time: '2024-03-26T22:52:38.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Harpies now correctly trill, tweet, chirp, and caw instead of
+        miraculously screeching about missing localizations.
+  id: 4885
+  time: '2024-03-27T12:31:17.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      message: Added beacons and maps to the station.
+    - type: Add
+      message: Added cameras to the station.
+    - type: Tweak
+      message: Remodeled SR office.
+    - type: Tweak
+      message: Swapped brig and theater locations.
+    - type: Fix
+      message: Fixed disposals.
+    - type: Fix
+      message: Named bus docks for STC.
+  id: 4886
+  time: '2024-03-27T20:49:47.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl
@@ -8,3 +8,8 @@ chat-speech-verb-felinid-1 = mraows
 chat-speech-verb-felinid-2 = mews
 chat-speech-verb-felinid-3 = meows
 chat-speech-verb-felinid-4 = purrs out
+
+chat-speech-verb-harpy-1 = chirps
+chat-speech-verb-harpy-2 = tweets
+chat-speech-verb-harpy-3 = caws
+chat-speech-verb-harpy-4 = trills
diff --git a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl