From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 8 Sep 2024 16:11:11 +0000 (+0000)
Subject: Automatic changelog update
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=dbb5da156e8f22e7ef563cb57dd2a922e2463c2a;p=space-station-14.git

Automatic changelog update
---

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c586c22305..651455cc61 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Elysium206
-  changes:
-  - message: Increased Security Riot shields durability significantly and makes actively
-      blocking better
-    type: Tweak
-  id: 6817
-  time: '2024-06-25T03:56:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29239
 - author: Tayrtahn
   changes:
   - message: Fixed space ninja's starting with their internals disabled.
@@ -3868,3 +3860,10 @@
   id: 7316
   time: '2024-09-08T12:10:50.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/31953
+- author: Beck Thompson
+  changes:
+  - message: Gold and silver rings now give a small amount of materials when scrapped.
+    type: Tweak
+  id: 7317
+  time: '2024-09-08T16:10:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31847