From d639820f6a40fe4d2875aa92fc3a0897c6576a23 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Fri, 12 Oct 2018 04:06:52 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                       | 19 +++++++++++++++++++
 html/changelogs/.all_changelog.yml        | 18 ++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-9343.yml | 12 ------------
 html/changelogs/AutoChangeLog-pr-9816.yml |  6 ------
 4 files changed, 37 insertions(+), 18 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9343.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-9816.yml

diff --git a/html/changelog.html b/html/changelog.html
index 72693ad1161..1d19c855ad3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,25 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">12 October 2018</h2>
+			<h3 class="author">Alonefromhell updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">META - Cargo shuttle blast doors now reacts to the right button.</li>
+				<li class="bugfix">META - Cargo shuttle airlocks now bolt properly.</li>
+				<li class="bugfix">META - Cargo shuttle flaps are now airtight. All hail Cargonia.</li>
+			</ul>
+			<h3 class="author">variableundefined updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Ore now represented by stack that holds up to 50 items. Should reduce lag with ORM greatly.</li>
+				<li class="tweak">Satchel can only carry ten items instead of 50 items. You should end up carrying more ore in total however</li>
+				<li class="rscadd">Fire acting on ore means they would be refined with 50% efficiency.</li>
+				<li class="rscadd">Stack merges automatically if dropped on the floor, or a new stack is created. This doesn't happens on your body.</li>
+				<li class="rscadd">They also merge if you drag them over eachother.</li>
+				<li class="rscadd">Alt-click split a stack</li>
+				<li class="rscadd">You can throw sand into people's eyes! Pocket sand!</li>
+				<li class="tweak">Phazon take 5 bluespace crystal to construct now instead of 1. remove: Transfer prompt when you click on a stack of the same type with a stack</li>
+			</ul>
+
 			<h2 class="date">11 October 2018</h2>
 			<h3 class="author">Citinited updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7ec03a59504..4a3974e3afd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7437,3 +7437,21 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Triiodine:
   - rscdel: SLOT_MASK from necklaces.
   - rscadd: thatdanguy23's fluff item
+2018-10-12:
+  Alonefromhell:
+  - bugfix: META - Cargo shuttle blast doors now reacts to the right button.
+  - bugfix: META - Cargo shuttle airlocks now bolt properly.
+  - bugfix: META - Cargo shuttle flaps are now airtight. All hail Cargonia.
+  variableundefined:
+  - tweak: Ore now represented by stack that holds up to 50 items. Should reduce lag
+      with ORM greatly.
+  - tweak: Satchel can only carry ten items instead of 50 items. You should end up
+      carrying more ore in total however
+  - rscadd: Fire acting on ore means they would be refined with 50% efficiency.
+  - rscadd: Stack merges automatically if dropped on the floor, or a new stack is
+      created. This doesn't happens on your body.
+  - rscadd: They also merge if you drag them over eachother.
+  - rscadd: Alt-click split a stack
+  - rscadd: You can throw sand into people's eyes! Pocket sand!
+  - tweak: 'Phazon take 5 bluespace crystal to construct now instead of 1. remove:
+      Transfer prompt when you click on a stack of the same type with a stack'
diff --git a/html/changelogs/AutoChangeLog-pr-9343.yml b/html/changelogs/AutoChangeLog-pr-9343.yml
deleted file mode 100644
index 155bcaf6adb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9343.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-author: "variableundefined"
-delete-after: True
-changes: 
-  - tweak: "Ore now represented by stack that holds up to 50 items. Should reduce lag with ORM greatly."
-  - tweak: "Satchel can only carry ten items instead of 50 items. You should end up carrying more ore in total however"
-  - rscadd: "Fire acting on ore means they would be refined with 50% efficiency."
-  - rscadd: "Stack merges automatically if dropped on the floor, or a new stack is created. This doesn't happens on your body."
-  - rscadd: "They also merge if you drag them over eachother."
-  - rscadd: "Alt-click split a stack"
-  - rscadd: "You can throw sand into people's eyes! Pocket sand!"
-  - tweak: "Phazon take 5 bluespace crystal to construct now instead of 1.
-remove: Transfer prompt when you click on a stack of the same type with a stack"
diff --git a/html/changelogs/AutoChangeLog-pr-9816.yml b/html/changelogs/AutoChangeLog-pr-9816.yml
deleted file mode 100644
index 3bf427ac9ee..00000000000
--- a/html/changelogs/AutoChangeLog-pr-9816.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Alonefromhell"
-delete-after: True
-changes: 
-  - bugfix: "META - Cargo shuttle blast doors now reacts to the right button."
-  - bugfix: "META - Cargo shuttle airlocks now bolt properly."
-  - bugfix: "META - Cargo shuttle flaps are now airtight. All hail Cargonia."