From 6f0c0ba60162ddd5a4e548ab07a1642479f8c262 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Mon, 27 Jun 2016 03:37:47 +0100
Subject: [PATCH] Updates changelog

---
 html/changelog.html                      |  7 +++++
 html/changelogs/.all_changelog.yml       |  6 ++++
 html/changelogs/JerTheAce_HoPLoyalty.yml | 36 -----------------------
 html/changelogs/Sin4_UIs.yml             | 37 ------------------------
 4 files changed, 13 insertions(+), 73 deletions(-)
 delete mode 100644 html/changelogs/JerTheAce_HoPLoyalty.yml
 delete mode 100644 html/changelogs/Sin4_UIs.yml

diff --git a/html/changelog.html b/html/changelog.html
index d47e0634cfb..fa4af7ed733 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">27 June 2016</h2>
+			<h3 class="author">Sin4 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added NanoUI for Advanced Body Scanners, Arcade, Atmospherics Control Computer, Chemmaster, Cloning Console, Fax Machines, Guestpass Console, Holodeck Computer, Laptop Vendors, Operating Computer, and Photocopiers.</li>
+				<li class="bugfix">Fixes chemmaster not putting pills in pill bottles.</li>
+			</ul>
+
 			<h2 class="date">21 June 2016</h2>
 			<h3 class="author">HarpyEagle updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9be7a417f69..2bb88fd72de 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2440,3 +2440,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: CentCom Fax, Admin Prayer, and CentCom emergency messages now prompt admins
       with a pleasing sound effect.
   - tweak: Fax machines now sound like fax machines and not polaroid cameras.
+2016-06-27:
+  Sin4:
+  - rscadd: Added NanoUI for Advanced Body Scanners, Arcade, Atmospherics Control
+      Computer, Chemmaster, Cloning Console, Fax Machines, Guestpass Console, Holodeck
+      Computer, Laptop Vendors, Operating Computer, and Photocopiers.
+  - bugfix: Fixes chemmaster not putting pills in pill bottles.
diff --git a/html/changelogs/JerTheAce_HoPLoyalty.yml b/html/changelogs/JerTheAce_HoPLoyalty.yml
deleted file mode 100644
index e9daa351da7..00000000000
--- a/html/changelogs/JerTheAce_HoPLoyalty.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: JerTheAce
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Head of Personnel now has a loyalty implant."
diff --git a/html/changelogs/Sin4_UIs.yml b/html/changelogs/Sin4_UIs.yml
deleted file mode 100644
index 87c1907c43e..00000000000
--- a/html/changelogs/Sin4_UIs.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Sin4
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Added NanoUI for Advanced Body Scanners, Arcade, Atmospherics Control Computer, Chemmaster, Cloning Console, Fax Machines, Guestpass Console, Holodeck Computer, Laptop Vendors, Operating Computer, and Photocopiers."
-  - bugfix: "Fixes chemmaster not putting pills in pill bottles."
\ No newline at end of file