From f02a02a393f91c0334d23df459b2aa4d4ccb92a4 Mon Sep 17 00:00:00 2001
From: sybil-tgstation13 <sybil@tgstation13.org>
Date: Mon, 6 Jul 2015 22:26:17 -0400
Subject: [PATCH] Automatic changelog compile

---
 html/changelog.html                     |  1 +
 html/changelogs/.all_changelog.yml      |  1 +
 html/changelogs/ikarrus-lizardnames.yml | 36 -------------------------
 3 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 html/changelogs/ikarrus-lizardnames.yml

diff --git a/html/changelog.html b/html/changelog.html
index f27ac8ecb01..8bdd24b91fc 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -63,6 +63,7 @@
 				<li class="tweak">Domination attempt limit is reduced to 1 per gang while the shuttle is docked with the station.</li>
 				<li class="tweak">Gang bosses can promote and recall the shuttle using spare gangtools</li>
 				<li class="bugfix">Fixed Gang bosses getting deconverted with head trauma</li>
+				<li class="rscadd">Lizard characters can now get random names unique from humans.</li>
 			</ul>
 
 			<h2 class="date">05 July 2015</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2ea9410bb49..72c37b4612e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3195,3 +3195,4 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       docked with the station.
   - tweak: Gang bosses can promote and recall the shuttle using spare gangtools
   - bugfix: Fixed Gang bosses getting deconverted with head trauma
+  - rscadd: Lizard characters can now get random names unique from humans.
diff --git a/html/changelogs/ikarrus-lizardnames.yml b/html/changelogs/ikarrus-lizardnames.yml
deleted file mode 100644
index 4a13636288f..00000000000
--- a/html/changelogs/ikarrus-lizardnames.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
-#   spellcheck (typo fixes)
-#   experiment
-#   tgs (TG-ported fixes?)
-#################################
-
-# Your name.  
-author: Ikarrus
-
-# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
-# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Lizard characters can now get random names unique from humans."
\ No newline at end of file