From 14df02563d6d3dca53c41d7485172e083b886ef9 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 29 Nov 2018 23:28:51 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.11.29.23.28.51"

---
 html/changelog.html                |  4 ++++
 html/changelogs/.all_changelog.yml |  3 +++
 html/changelogs/SchevProtoguns.yml | 37 ------------------------------
 3 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 html/changelogs/SchevProtoguns.yml

diff --git a/html/changelog.html b/html/changelog.html
index 8e66ebc9d3f..a18feae6dde 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -71,6 +71,10 @@
 				<li class="rscadd">Adds two new headtail styles, three new headdress garments, and a bunch of cloths/bands.</li>
 				<li class="bugfix">Darkens and brings in line the Skrell sprite with every other species sprite. Colors will now be more accurate, and you can now actually find a good green.</li>
 			</ul>
+			<h3 class="author">Scheveningen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Protolaser guns now have 2 more modifier slots for each of the various frames. Have fun!</li>
+			</ul>
 
 			<h2 class="date">28 November 2018</h2>
 			<h3 class="author">PoZe updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 04aab1a4429..057e0dc2a66 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6638,3 +6638,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Darkens and brings in line the Skrell sprite with every other species
       sprite. Colors will now be more accurate, and you can now actually find a good
       green.
+  Scheveningen:
+  - tweak: Protolaser guns now have 2 more modifier slots for each of the various
+      frames. Have fun!
diff --git a/html/changelogs/SchevProtoguns.yml b/html/changelogs/SchevProtoguns.yml
deleted file mode 100644
index 62ddf1849e2..00000000000
--- a/html/changelogs/SchevProtoguns.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
-#   balance
-#################################
-
-# Your name.  
-author: Scheveningen
-
-# 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: 
-  - tweak: "Protolaser guns now have 2 more modifier slots for each of the various frames. Have fun!"