From ce085fd9ff77ac92e93fdeed643bff5cc0bf3cdc Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 21 Sep 2019 18:35:46 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.09.21.18.35.46"

---
 html/changelog.html                    |  5 +++
 html/changelogs/.all_changelog.yml     |  4 +++
 html/changelogs/change_ipc_screens.yml | 42 --------------------------
 3 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/change_ipc_screens.yml

diff --git a/html/changelog.html b/html/changelog.html
index e06cbb4e623..28cefcbc7ae 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -71,6 +71,11 @@
 				<li class="bugfix">Fixes service module cyborgs dispensing drinks at the wrong temperature.</li>
 				<li class="tweak">Reagents that should be at room temperature will no longer be described as lukewarm.</li>
 			</ul>
+			<h3 class="author">Mwahahahaha updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added the ability for Baseline Frames to change screens on the go (Change IC Screen verb in IC tab).</li>
+				<li class="bugfix">Re-added the ability for Shell Frames to run self-diagnostics! (my bad)</li>
+			</ul>
 			<h3 class="author">Skull132 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">The gatling laser no longer gets stuck in a state of locked up when you move while charging it.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ba2a38a72cc..54b06fc2a35 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9100,6 +9100,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixes service module cyborgs dispensing drinks at the wrong temperature.
   - tweak: Reagents that should be at room temperature will no longer be described
       as lukewarm.
+  Mwahahahaha:
+  - rscadd: Added the ability for Baseline Frames to change screens on the go (Change
+      IC Screen verb in IC tab).
+  - bugfix: Re-added the ability for Shell Frames to run self-diagnostics! (my bad)
   Skull132:
   - bugfix: The gatling laser no longer gets stuck in a state of locked up when you
       move while charging it.
diff --git a/html/changelogs/change_ipc_screens.yml b/html/changelogs/change_ipc_screens.yml
deleted file mode 100644
index f6ed657da79..00000000000
--- a/html/changelogs/change_ipc_screens.yml
+++ /dev/null
@@ -1,42 +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
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.  
-author: Mwahahahaha
-
-# 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 the ability for Baseline Frames to change screens on the go (Change IC Screen verb in IC tab)."
-  - bugfix: "Re-added the ability for Shell Frames to run self-diagnostics! (my bad)"
\ No newline at end of file