From b51c6bd4a5e7d413b981dcd90a4bffe735ae6696 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 23 May 2022 16:03:25 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.05.23.16.03.25"

---
 html/changelog.html                        |  3 ++
 html/changelogs/.all_changelog.yml         |  3 ++
 html/changelogs/mattatlas-fixcamerabug.yml | 43 ----------------------
 3 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-fixcamerabug.yml

diff --git a/html/changelog.html b/html/changelog.html
index d8d93830ec8..df6d87fdf08 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -69,6 +69,9 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">You now interact with doors if you click the tile under them. Doors are given precedence to firedoors.</li>
 				<li class="rscadd">You now interact with elevator buttons or lift panels if you click the tile in front of them -- not the wall they&#x27;re on, as the buttons are mapped on the floors.</li>
+				<li class="bugfix">Non-modular camera consoles now work properly.</li>
+				<li class="bugfix">Full auto no longer prevents you from throwing or using weapon safeties.</li>
+				<li class="bugfix">Networks are no longer switched if accessing an unauthorized camera network.</li>
 			</ul>
 			<h3 class="author">RisingValiant updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8d664347b1a..424cdf223d3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -24250,6 +24250,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: You now interact with elevator buttons or lift panels if you click the
       tile in front of them -- not the wall they&#x27;re on, as the buttons are mapped
       on the floors.
+  - bugfix: Non-modular camera consoles now work properly.
+  - bugfix: Full auto no longer prevents you from throwing or using weapon safeties.
+  - bugfix: Networks are no longer switched if accessing an unauthorized camera network.
   RisingValiant:
   - bugfix: added a check to the relaymove call in cryo.dm that checks if you&#x27;re
       inside the cryocell before calling relaymove when you move.
diff --git a/html/changelogs/mattatlas-fixcamerabug.yml b/html/changelogs/mattatlas-fixcamerabug.yml
deleted file mode 100644
index 596f1e2d641..00000000000
--- a/html/changelogs/mattatlas-fixcamerabug.yml
+++ /dev/null
@@ -1,43 +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:
-  - bugfix: "Non-modular camera consoles now work properly."
-  - bugfix: "Full auto no longer prevents you from throwing or using weapon safeties."
-  - bugfix: "Networks are no longer switched if accessing an unauthorized camera network."