From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 8 May 2024 00:21:01 +0000 (+0000)
Subject: Automatic changelog update
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=18bd221407d46725fc928cc6b5f4f8ee34ba0a76;p=space-station-14.git

Automatic changelog update
---

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3ce8ccd5ec..96c8b20e76 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Whisper
-  changes:
-  - message: Iron and copper no longer grant infinite blood!
-    type: Fix
-  id: 6050
-  time: '2024-02-28T21:56:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25678
 - author: Cojoke-dot
   changes:
   - message: E-sword now lights plasma fires
@@ -3853,3 +3846,12 @@
   id: 6549
   time: '2024-05-07T18:20:44.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/25515
+- author: OnsenCapy
+  changes:
+  - message: Combat gloves now have their own unique sprite.
+    type: Tweak
+  - message: Combat gloves now have heat resistance to match their fireproof description.
+    type: Tweak
+  id: 6550
+  time: '2024-05-08T00:19:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27373