From 7d252f2c1583af7358a3193ff94848bd6922d7bb Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 6 Jul 2020 15:58:38 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.06.15.58.38"

---
 html/changelog.html                           |  5 +++
 html/changelogs/.all_changelog.yml            |  5 +++
 html/changelogs/mattatlas-doorfix.yml         | 41 -------------------
 html/changelogs/wezzy_onehandedcig_bugfix.yml | 41 -------------------
 4 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-doorfix.yml
 delete mode 100644 html/changelogs/wezzy_onehandedcig_bugfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4d33b754693..428b565c788 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,11 +40,16 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Made it so that Changelings can't absorb DNA if they're inside a sealed void suit.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Hitting walls is now instant instead of being charged up. This means you can no longer queue up an insane amount of attacks.</li>
+			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Bolds the amount of things in a stack when examined.</li>
 				<li class="bugfix">Lighters actually update their inhands now.</li>
 				<li class="imageadd">Lighters actually have inhands now.</li>
+				<li class="bugfix">Fixes the message for pulling cigarettes out of cigarette packets using your mouth.</li>
 			</ul>
 			<h3 class="author">armrha updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 91c5477aa21..fd3af16755d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14040,10 +14040,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Decepter:
   - tweak: Made it so that Changelings can't absorb DNA if they're inside a sealed
       void suit.
+  MattAtlas:
+  - tweak: Hitting walls is now instant instead of being charged up. This means you
+      can no longer queue up an insane amount of attacks.
   Wowzewow (Wezzy):
   - rscadd: Bolds the amount of things in a stack when examined.
   - bugfix: Lighters actually update their inhands now.
   - imageadd: Lighters actually have inhands now.
+  - bugfix: Fixes the message for pulling cigarettes out of cigarette packets using
+      your mouth.
   armrha:
   - rscadd: Modified mob/living/simple_animal/friendly/cat and /mob/living/simple_animal
       to allow cats to turn colors in radiation, modified modules/events/radiation_storm
diff --git a/html/changelogs/mattatlas-doorfix.yml b/html/changelogs/mattatlas-doorfix.yml
deleted file mode 100644
index a949255b22c..00000000000
--- a/html/changelogs/mattatlas-doorfix.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: 
-  - tweak: "Hitting walls is now instant instead of being charged up. This means you can no longer queue up an insane amount of attacks."
diff --git a/html/changelogs/wezzy_onehandedcig_bugfix.yml b/html/changelogs/wezzy_onehandedcig_bugfix.yml
deleted file mode 100644
index c653cbe4cdb..00000000000
--- a/html/changelogs/wezzy_onehandedcig_bugfix.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: Wowzewow (Wezzy)
-
-# 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: "Fixes the message for pulling cigarettes out of cigarette packets using your mouth."