From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 30 Jun 2024 04:29:56 +0000 (+0000)
Subject: Automatic changelog update
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3aa6270de64667a3d382e5fbb93dda76fb5dc100;p=space-station-14.git

Automatic changelog update
---

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5d1bcbd4c6..19b08ef269 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: FungiFellow
-  changes:
-  - message: Removed Crusher Dagger from Grapple Module
-    type: Remove
-  id: 6341
-  time: '2024-04-13T15:35:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26865
 - author: ShadowCommander
   changes:
   - message: Fixed the pull hotkey not pulling the new entity when you are already
@@ -3830,3 +3823,10 @@
   id: 6840
   time: '2024-06-30T03:46:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29590
+- author: metalgearsloth
+  changes:
+  - message: Fix trait categories not respecting unlimited points.
+    type: Fix
+  id: 6841
+  time: '2024-06-30T04:28:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29600