From a04fdb1798a3bb3adaf2e45e0c844adbb060f21c Mon Sep 17 00:00:00 2001
From: TheDZD <leonardo.o.costa7@gmail.com>
Date: Wed, 25 May 2016 19:29:16 -0400
Subject: [PATCH] Adds salt emote

---
 html/changelog.html                       | 17 +++++++++++++++++
 html/changelogs/.all_changelog.yml        | 12 ++++++++++++
 html/changelogs/AutoChangeLog-pr-4365.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-4491.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-4495.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-4497.yml |  4 ----
 6 files changed, 29 insertions(+), 18 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4365.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4491.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4495.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-4497.yml

diff --git a/html/changelog.html b/html/changelog.html
index 6dd72e8b199..0f07dfeafff 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,23 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">25 May 2016</h2>
+			<h3 class="author">CrAzYPiLoT updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds an unread change notification.</li>
+			</ul>
+			<h3 class="author">Fox McCloud updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Removes Dragon's Breath Recipe</li>
+				<li class="tweak">Removes Ghost Chilli Juice</li>
+				<li class="bugfix">Fixes buckled flipping over someone</li>
+			</ul>
+			<h3 class="author">IK3I updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Sleepers, scanners, and borg chargers no longer remove you from existence when destroyed</li>
+				<li class="bugfix">Hostile mobs are no longer fooled by your clever scanner and recharger tricks</li>
+			</ul>
+
 			<h2 class="date">24 May 2016</h2>
 			<h3 class="author">CrAzYPiLoT updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4c51d3064fb..01ed2ae642f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1587,3 +1587,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscdel: Removes n2 pills healing vox oxyloss, and o2 pills poisoning vox.
   monster860:
   - rscadd: Adds the floor painter. Sprite by FlattestGuitar
+2016-05-25:
+  CrAzYPiLoT:
+  - rscadd: Adds an unread change notification.
+  Fox McCloud:
+  - tweak: Removes Dragon's Breath Recipe
+  - tweak: Removes Ghost Chilli Juice
+  - bugfix: Fixes buckled flipping over someone
+  IK3I:
+  - bugfix: Sleepers, scanners, and borg chargers no longer remove you from existence
+      when destroyed
+  - bugfix: Hostile mobs are no longer fooled by your clever scanner and recharger
+      tricks
diff --git a/html/changelogs/AutoChangeLog-pr-4365.yml b/html/changelogs/AutoChangeLog-pr-4365.yml
deleted file mode 100644
index 42acfa5caa1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4365.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: CrAzYPiLoT
-delete-after: True
-changes: 
-  - rscadd: "Adds an unread change notification."
diff --git a/html/changelogs/AutoChangeLog-pr-4491.yml b/html/changelogs/AutoChangeLog-pr-4491.yml
deleted file mode 100644
index dc11b5f060a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4491.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: IK3I
-delete-after: True
-changes: 
-  - bugfix: "Sleepers, scanners, and borg chargers no longer remove you from existence when destroyed"
-  - bugfix: "Hostile mobs are no longer fooled by your clever scanner and recharger tricks"
diff --git a/html/changelogs/AutoChangeLog-pr-4495.yml b/html/changelogs/AutoChangeLog-pr-4495.yml
deleted file mode 100644
index 494d34ff723..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4495.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes: 
-  - tweak: "Removes Dragon's Breath Recipe"
-  - tweak: "Removes Ghost Chilli Juice"
diff --git a/html/changelogs/AutoChangeLog-pr-4497.yml b/html/changelogs/AutoChangeLog-pr-4497.yml
deleted file mode 100644
index e8e2defac22..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4497.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes: 
-  - bugfix: "Fixes buckled flipping over someone"