From e51ca58451606b2ee31dd110a5f33460aa024f4c Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sat, 10 Nov 2018 22:33:33 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 9 +++++++++
 html/changelogs/.all_changelog.yml         | 6 ++++++
 html/changelogs/AutoChangeLog-pr-10176.yml | 4 ----
 html/changelogs/AutoChangeLog-pr-10177.yml | 5 -----
 4 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-10176.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-10177.yml

diff --git a/html/changelog.html b/html/changelog.html
index 60f40c23d99..e7a09401f11 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -62,6 +62,15 @@
 				<li class="bugfix">Prevents an infinite metal exploit using the autolathe.</li>
 				<li class="tweak">Minimum returnable metal of ammunition boxes has been lowered from 2000 to 500.</li>
 			</ul>
+			<h3 class="author">Dovydas12345 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes being unable to slice certain food grown by hydroponics (pineapple, watermelon etc.)</li>
+			</ul>
+			<h3 class="author">Shazbot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Some fancy new box sprites, props to Shazbot for the sprites</li>
+				<li class="imagedel">Old cuff box is gone</li>
+			</ul>
 			<h3 class="author">TDSSS updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Quarantine is now its own lawset.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ccd51adf433..ac256a5fd9e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7974,5 +7974,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Prevents an infinite metal exploit using the autolathe.
   - tweak: Minimum returnable metal of ammunition boxes has been lowered from 2000
       to 500.
+  Dovydas12345:
+  - bugfix: Fixes being unable to slice certain food grown by hydroponics (pineapple,
+      watermelon etc.)
+  Shazbot:
+  - imageadd: Some fancy new box sprites, props to Shazbot for the sprites
+  - imagedel: Old cuff box is gone
   TDSSS:
   - tweak: Quarantine is now its own lawset.
diff --git a/html/changelogs/AutoChangeLog-pr-10176.yml b/html/changelogs/AutoChangeLog-pr-10176.yml
deleted file mode 100644
index 56a413ff10f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10176.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Dovydas12345"
-delete-after: True
-changes: 
-  - bugfix: "Fixes being unable to slice certain food grown by hydroponics (pineapple, watermelon etc.)"
diff --git a/html/changelogs/AutoChangeLog-pr-10177.yml b/html/changelogs/AutoChangeLog-pr-10177.yml
deleted file mode 100644
index 4499e095752..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10177.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Shazbot"
-delete-after: True
-changes: 
-  - imageadd: "Some fancy new box sprites, props to Shazbot for the sprites"
-  - imagedel: "Old cuff box is gone"