From 4bdc1aa8ed91f2b45f0319696187ef59834e93cd Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 29 Aug 2020 14:25:40 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.08.29.14.25.40"

---
 html/changelog.html                           | 23 ++++++++
 html/changelogs/.all_changelog.yml            | 23 ++++++++
 .../Ferner-200826-coding_stampfiesta.yml      |  6 --
 html/changelogs/mattatlas-bugfixgalore.yml    | 55 -------------------
 4 files changed, 46 insertions(+), 61 deletions(-)
 delete mode 100644 html/changelogs/Ferner-200826-coding_stampfiesta.yml
 delete mode 100644 html/changelogs/mattatlas-bugfixgalore.yml

diff --git a/html/changelog.html b/html/changelog.html
index 06dadc20b61..d265736b216 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,10 +36,33 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">29 August 2020</h2>
+			<h3 class="author">Ferner updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added some new, faction specific stamps, some corporate liaisons and consular representatives spawn with them.</li>
+				<li class="tweak">Chameleon stamps now have a rename function, incase you need to fake the authority of a smaller faction that doesn't have an official stamp design(yet).</li>
+				<li class="bugfix">Chameleon stamps now exclude fluff/custom item stamps from their selection.</li>
+			</ul>
 			<h3 class="author">Goret updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">The inhand sprite of the butcher's cleaver is back.</li>
 			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Diona nymph death period before being inhabited is now twice as long, actually allowing people to get into them.</li>
+				<li class="bugfix">Removed a useless, nonfunctional admin secret.</li>
+				<li class="bugfix">Borgs can now pick up slime positions.</li>
+				<li class="bugfix">AIs can no longer use mechs while unwrenched.</li>
+				<li class="bugfix">The wristbound computer sprite can now be switched in the ID slot.</li>
+				<li class="bugfix">Expedition shotguns now have proper directional sprites.</li>
+				<li class="bugfix">Blind talismans now actually work.</li>
+				<li class="bugfix">Synthskin limbs now match the mob's color.</li>
+				<li class="bugfix">Mech wreckages can now properly be scavenged with a welding tool and wrench.</li>
+				<li class="bugfix">MMIs and robot boards can no longer be used as IPC brains.</li>
+				<li class="bugfix">Armblades now properly play the blade sound.</li>
+				<li class="bugfix">Trinary perfection antenna now also renders on the ear.</li>
+				<li class="bugfix">Simple mobs such as cult constructs can now target and hit specific limbs.</li>
+				<li class="bugfix">Applying pressure to your wounds no longer ignores species blood color when bloodying your hands.</li>
+			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes drone hatches on airlocks. Finally.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 23b80d9638e..29aa6751e1a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -15144,7 +15144,30 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       To prevent people circumventing the slowdown from pulling a slow mob by putting
       them inside something first. Roller beds & Wheelchairs are exempt from this.
 2020-08-29:
+  Ferner:
+  - rscadd: Added some new, faction specific stamps, some corporate liaisons and consular
+      representatives spawn with them.
+  - tweak: Chameleon stamps now have a rename function, incase you need to fake the
+      authority of a smaller faction that doesn't have an official stamp design(yet).
+  - bugfix: Chameleon stamps now exclude fluff/custom item stamps from their selection.
   Goret:
   - bugfix: The inhand sprite of the butcher's cleaver is back.
+  MattAtlas:
+  - bugfix: Diona nymph death period before being inhabited is now twice as long,
+      actually allowing people to get into them.
+  - bugfix: Removed a useless, nonfunctional admin secret.
+  - bugfix: Borgs can now pick up slime positions.
+  - bugfix: AIs can no longer use mechs while unwrenched.
+  - bugfix: The wristbound computer sprite can now be switched in the ID slot.
+  - bugfix: Expedition shotguns now have proper directional sprites.
+  - bugfix: Blind talismans now actually work.
+  - bugfix: Synthskin limbs now match the mob's color.
+  - bugfix: Mech wreckages can now properly be scavenged with a welding tool and wrench.
+  - bugfix: MMIs and robot boards can no longer be used as IPC brains.
+  - bugfix: Armblades now properly play the blade sound.
+  - bugfix: Trinary perfection antenna now also renders on the ear.
+  - bugfix: Simple mobs such as cult constructs can now target and hit specific limbs.
+  - bugfix: Applying pressure to your wounds no longer ignores species blood color
+      when bloodying your hands.
   Wowzewow (Wezzy):
   - bugfix: Fixes drone hatches on airlocks. Finally.
diff --git a/html/changelogs/Ferner-200826-coding_stampfiesta.yml b/html/changelogs/Ferner-200826-coding_stampfiesta.yml
deleted file mode 100644
index 4eb2bddbcac..00000000000
--- a/html/changelogs/Ferner-200826-coding_stampfiesta.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Ferner
-delete-after: True
-changes: 
-  - rscadd: "Added some new, faction specific stamps, some corporate liaisons and consular representatives spawn with them."
-  - tweak: "Chameleon stamps now have a rename function, incase you need to fake the authority of a smaller faction that doesn't have an official stamp design(yet)."
-  - bugfix: "Chameleon stamps now exclude fluff/custom item stamps from their selection."
\ No newline at end of file
diff --git a/html/changelogs/mattatlas-bugfixgalore.yml b/html/changelogs/mattatlas-bugfixgalore.yml
deleted file mode 100644
index 293a4b13f59..00000000000
--- a/html/changelogs/mattatlas-bugfixgalore.yml
+++ /dev/null
@@ -1,55 +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: "Diona nymph death period before being inhabited is now twice as long, actually allowing people to get into them."
-  - bugfix: "Removed a useless, nonfunctional admin secret."
-  - bugfix: "Borgs can now pick up slime positions."
-  - bugfix: "AIs can no longer use mechs while unwrenched."
-  - bugfix: "The wristbound computer sprite can now be switched in the ID slot."
-  - bugfix: "Expedition shotguns now have proper directional sprites."
-  - bugfix: "Blind talismans now actually work."
-  - bugfix: "Synthskin limbs now match the mob's color."
-  - bugfix: "Mech wreckages can now properly be scavenged with a welding tool and wrench."
-  - bugfix: "MMIs and robot boards can no longer be used as IPC brains."
-  - bugfix: "Armblades now properly play the blade sound."
-  - bugfix: "Trinary perfection antenna now also renders on the ear."
-  - bugfix: "Simple mobs such as cult constructs can now target and hit specific limbs."
-  - bugfix: "Applying pressure to your wounds no longer ignores species blood color when bloodying your hands."
-