From eb915075135c89f245ec63f8346a3bff1782065b Mon Sep 17 00:00:00 2001
From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com>
Date: Mon, 18 Dec 2023 01:21:30 +0000
Subject: [PATCH] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D1=8F=20=D1=87=D0=B5=D0=B9?=
 =?UTF-8?q?=D0=BD=D0=B4=D0=B6=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2=20[ci=20skip]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/changelog.html                              | 14 ++++++++++++++
 html/changelogs/.all_changelog.yml               | 12 ++++++++++++
 html/changelogs/AutoChangeLog-sierra-pr-1638.yml | 10 ----------
 html/changelogs/AutoChangeLog-sierra-pr-1639.yml |  5 -----
 4 files changed, 26 insertions(+), 15 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1638.yml
 delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1639.yml

diff --git a/html/changelog.html b/html/changelog.html
index 032a6d800e0b0..5cfbc1831fd1b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -28,6 +28,20 @@ <h2>Sierra SS13</h2>
 		-->
 		<div class="changelog">
 
+			<h2 class="date">18.12 - 2023</h2>
+			<h3 class="author">Обновления Al-1ce:</h3>
+			<div class="changes bgimages16">
+				<div class="log tweak">Adds a bunch of mixing descriptions to drinks that lacked them.</div>
+				<div class="log tweak">Changes some of the pre-existing mixing descriptions.</div>
+			</div>
+			<h3 class="author">Обновления emmanuelbassil:</h3>
+			<div class="changes bgimages16">
+				<div class="log bugfix">Fixes oversight where some storage items that could collect all items off a turf could not have that mode toggled off.</div>
+				<div class="log bugfix">Fixes being unable to use pill bottles on a storage object or reagent container</div>
+				<div class="log tweak">Removed behavior where clicking on a storage item on the floor with another storage item sometimes led to picking up the item off the floor.</div>
+				<div class="log tweak">Can now quickly empty pill bottles and the excavation pick set.</div>
+			</div>
+
 			<h2 class="date">17.12 - 2023</h2>
 			<h3 class="author">Обновления emmanuelbassil:</h3>
 			<div class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9253ceeb6bf3d..b647854f6410d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -22698,3 +22698,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY sierra_genchangelog.p
   - bugfix: Fixes memorial stone causing dogtags from other branches to disappear
   - bugfix: Fixes helm and sensor consoles not deleting properly
   - bugfix: Fixes welding step of APC deconstruction
+2023-12-18:
+  Al-1ce:
+  - tweak: Adds a bunch of mixing descriptions to drinks that lacked them.
+  - tweak: Changes some of the pre-existing mixing descriptions.
+  emmanuelbassil:
+  - bugfix: Fixes oversight where some storage items that could collect all items
+      off a turf could not have that mode toggled off.
+  - bugfix: Fixes being unable to use pill bottles on a storage object or reagent
+      container
+  - tweak: Removed behavior where clicking on a storage item on the floor with another
+      storage item sometimes led to picking up the item off the floor.
+  - tweak: Can now quickly empty pill bottles and the excavation pick set.
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1638.yml b/html/changelogs/AutoChangeLog-sierra-pr-1638.yml
deleted file mode 100644
index b99648b395041..0000000000000
--- a/html/changelogs/AutoChangeLog-sierra-pr-1638.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: emmanuelbassil
-changes:
-  - {bugfix: Fixes oversight where some storage items that could collect all items
-      off a turf could not have that mode toggled off.}
-  - {bugfix: Fixes being unable to use pill bottles on a storage object or reagent
-      container}
-  - {tweak: Removed behavior where clicking on a storage item on the floor with another
-      storage item sometimes led to picking up the item off the floor.}
-  - {tweak: Can now quickly empty pill bottles and the excavation pick set.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1639.yml b/html/changelogs/AutoChangeLog-sierra-pr-1639.yml
deleted file mode 100644
index 47624e02d43ac..0000000000000
--- a/html/changelogs/AutoChangeLog-sierra-pr-1639.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Al-1ce
-changes:
-  - {tweak: Adds a bunch of mixing descriptions to drinks that lacked them.}
-  - {tweak: Changes some of the pre-existing mixing descriptions.}
-delete-after: true