From 165ec65a61edf03c601dd3d9d1c839bea5660c8a Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 28 Aug 2020 09:41:01 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.08.28.09.41.01"

---
 html/changelog.html                           | 20 +++++++++
 html/changelogs/.all_changelog.yml            | 17 ++++++++
 .../WilliamMurdoch-IPCPosibrainNameFix.yml    | 41 -------------------
 html/changelogs/alberykborg.yml               |  6 ---
 html/changelogs/geeves-diona_pain_buff.yml    |  9 ----
 html/changelogs/geeves-psipower_tweakery.yml  |  8 ----
 6 files changed, 37 insertions(+), 64 deletions(-)
 delete mode 100644 html/changelogs/WilliamMurdoch-IPCPosibrainNameFix.yml
 delete mode 100644 html/changelogs/alberykborg.yml
 delete mode 100644 html/changelogs/geeves-diona_pain_buff.yml
 delete mode 100644 html/changelogs/geeves-psipower_tweakery.yml

diff --git a/html/changelog.html b/html/changelog.html
index 7bc3f0449ff..9f19abe0e9d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,26 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">28 August 2020</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Mining borgs should now have access to a scanner pda to find ores.</li>
+			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Diona take less pain damage from lack of light.</li>
+				<li class="tweak">Diona now take 50% the usual pain damage, down from 70%.</li>
+				<li class="tweak">General pain messages now have a 5 second delay between them to prevent spam.</li>
+				<li class="tweak">Diona can now feel which organ of theirs are damaged, instead of pointing to the parent organ.</li>
+				<li class="tweak">Psychokinetic tools have been given new sprites. Changing what it's emulating has now been given a radial menu.</li>
+				<li class="bugfix">Psychokinetic tools, psi-blades, and telekinetic grabs now properly delete when dropped or thrown.</li>
+				<li class="tweak">Psi-tools now do slightly more damage, 5, up from 1.</li>
+			</ul>
+			<h3 class="author">WilliamMurdoch updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes IPC positronic brains to now display names properly.</li>
+			</ul>
+
 			<h2 class="date">27 August 2020</h2>
 			<h3 class="author">WilliamMurdoch updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cab14f57923..796fed2d3da 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -15110,3 +15110,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-08-27:
   WilliamMurdoch:
   - bugfix: Allows any object with a flame to burn flags.
+2020-08-28:
+  Alberyk:
+  - rscadd: Mining borgs should now have access to a scanner pda to find ores.
+  Geeves:
+  - tweak: Diona take less pain damage from lack of light.
+  - tweak: Diona now take 50% the usual pain damage, down from 70%.
+  - tweak: General pain messages now have a 5 second delay between them to prevent
+      spam.
+  - tweak: Diona can now feel which organ of theirs are damaged, instead of pointing
+      to the parent organ.
+  - tweak: Psychokinetic tools have been given new sprites. Changing what it's emulating
+      has now been given a radial menu.
+  - bugfix: Psychokinetic tools, psi-blades, and telekinetic grabs now properly delete
+      when dropped or thrown.
+  - tweak: Psi-tools now do slightly more damage, 5, up from 1.
+  WilliamMurdoch:
+  - bugfix: Fixes IPC positronic brains to now display names properly.
diff --git a/html/changelogs/WilliamMurdoch-IPCPosibrainNameFix.yml b/html/changelogs/WilliamMurdoch-IPCPosibrainNameFix.yml
deleted file mode 100644
index 9d16882aebd..00000000000
--- a/html/changelogs/WilliamMurdoch-IPCPosibrainNameFix.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: WilliamMurdoch
-
-# 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 IPC positronic brains to now display names properly."
diff --git a/html/changelogs/alberykborg.yml b/html/changelogs/alberykborg.yml
deleted file mode 100644
index 40c1561236d..00000000000
--- a/html/changelogs/alberykborg.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Alberyk
-
-delete-after: True
-
-changes: 
-  - rscadd: "Mining borgs should now have access to a scanner pda to find ores."
diff --git a/html/changelogs/geeves-diona_pain_buff.yml b/html/changelogs/geeves-diona_pain_buff.yml
deleted file mode 100644
index db1bab446de..00000000000
--- a/html/changelogs/geeves-diona_pain_buff.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - tweak: "Diona take less pain damage from lack of light."
-  - tweak: "Diona now take 50% the usual pain damage, down from 70%."
-  - tweak: "General pain messages now have a 5 second delay between them to prevent spam."
-  - tweak: "Diona can now feel which organ of theirs are damaged, instead of pointing to the parent organ."
diff --git a/html/changelogs/geeves-psipower_tweakery.yml b/html/changelogs/geeves-psipower_tweakery.yml
deleted file mode 100644
index f6a608d5dcc..00000000000
--- a/html/changelogs/geeves-psipower_tweakery.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - tweak: "Psychokinetic tools have been given new sprites. Changing what it's emulating has now been given a radial menu."
-  - bugfix: "Psychokinetic tools, psi-blades, and telekinetic grabs now properly delete when dropped or thrown."
-  - tweak: "Psi-tools now do slightly more damage, 5, up from 1."