From bb9a28d81daf46761a8a2caae566548d88d3d120 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 6 Sep 2019 19:52:43 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.09.06.19.52.43"

---
 html/changelog.html                      |  4 +++
 html/changelogs/.all_changelog.yml       |  2 ++
 html/changelogs/mattatlas-altlockers.yml | 41 ------------------------
 3 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-altlockers.yml

diff --git a/html/changelog.html b/html/changelog.html
index 20d8912e09f..3ce7a2b4830 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,10 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed some minor sprite issues with the riot helmet, black boots, leg guards and tac-mask.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can now alt click lockers to lock them.</li>
+			</ul>
 			<h3 class="author">Wowzewow updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Increases the size of the mop bucket by 3x, and makes mop mop faster, like, 1.5x faster.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9553b352b75..30511430f55 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8907,6 +8907,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   AmoryBlaine, Ferner:
   - bugfix: Fixed some minor sprite issues with the riot helmet, black boots, leg
       guards and tac-mask.
+  MattAtlas:
+  - rscadd: You can now alt click lockers to lock them.
   Wowzewow:
   - tweak: Increases the size of the mop bucket by 3x, and makes mop mop faster, like,
       1.5x faster.
diff --git a/html/changelogs/mattatlas-altlockers.yml b/html/changelogs/mattatlas-altlockers.yml
deleted file mode 100644
index 3cda3604f99..00000000000
--- a/html/changelogs/mattatlas-altlockers.yml
+++ /dev/null
@@ -1,41 +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: MattAtlas
-
-# 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: "You can now alt click lockers to lock them."
\ No newline at end of file