Merge branch 'master' into borg

DeltaV-Station · Jul 28, 2024 · 7d1549c · 7d1549c
2 parents 7dfad37 + 5679554
commit 7d1549c
Show file tree

Hide file tree

Showing 36 changed files with 50,669 additions and 40,599 deletions.
diff --git a/Resources/Audio/DeltaV/Jukebox/femtanyl_-_MURDER_EVERY_1_U_KNOW_feat._takihasdied_MONO.ogg b/Resources/Audio/DeltaV/Jukebox/femtanyl_-_MURDER_EVERY_1_U_KNOW_feat._takihasdied_MONO.ogg
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -3111,3 +3111,27 @@
   id: 449
   time: '2024-07-25T03:21:31.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1534
+- author: jimmy12or
+  changes:
+  - message: Added a Ghost Pepper! A friendly looking Pepper that's so Spicy, it hurts!
+    type: Add
+  - message: Added a Cosmic Revenant! A spooky mutation of the Ghost pepper that produced
+      Ectoplasm.
+    type: Add
+  id: 450
+  time: '2024-07-27T10:53:18.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1542
+- author: Fox
+  changes:
+  - message: Edge has undergone some major reconstruction! Check out the new maints!
+    type: Tweak
+  id: 451
+  time: '2024-07-27T15:09:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1439
+- author: Colin-Tel
+  changes:
+  - message: Service Workers now wear pants by default.
+    type: Fix
+  id: 452
+  time: '2024-07-27T15:18:38.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1545
diff --git a/Resources/Locale/en-US/deltav/seeds.ftl b/Resources/Locale/en-US/deltav/seeds.ftl
@@ -1,3 +1,7 @@
 # Seeds
 seeds-CrystalThistle-name = CrystalThistle
 seeds-CrystalThistle-display-name = CrystalThistle
+seeds-GhostPepper-name = Ghost Pepper
+seeds-GhostPepper-display-name = Ghost Pepper
+seeds-CosmicRevenant-name = Cosmic Revenant
+seeds-CosmicRevenant-display-name = Cosmic Revenant Pepper