From 54c353146fc80ef069a60b535376bc2cb6c69876 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 1 Dec 2020 20:08:31 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.12.01.20.08.31"

---
 html/changelog.html                           |  5 +++
 html/changelogs/.all_changelog.yml            |  3 ++
 html/changelogs/geeves-cool_painters.yml      |  6 ---
 .../changelogs/wezzy_paiunfoldglassjarfix.yml | 41 -------------------
 4 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 html/changelogs/geeves-cool_painters.yml
 delete mode 100644 html/changelogs/wezzy_paiunfoldglassjarfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index 05d6b9e7229..de464407fc3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,7 @@
 				<li class="bugfix">Species with off-centre alignments will now retain those alignments after attacking or after being grabbed.</li>
 				<li class="rscadd">You can now destroy the energy fields that shield generators make by hitting it, as long as your weapon is strong enough.</li>
 				<li class="rscadd">Energy shields now fade in and fade out, instead of just popping into existence.</li>
+				<li class="tweak">Ported Pipe- and Floor Painter sprites from Paradise.</li>
 			</ul>
 			<h3 class="author">Karolis2011 updated:</h3>
 			<ul class="changes bgimages16">
@@ -59,6 +60,10 @@
 			<ul class="changes bgimages16">
 				<li class="backend">Gloves and mobs no longer keep a hardref to the mob whose blood they are covered in.</li>
 			</ul>
+			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes pAIs unfolding out of glass jars.</li>
+			</ul>
 
 			<h2 class="date">26 November 2020</h2>
 			<h3 class="author">Ferner updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index be887c4b2d9..37c5be1e7f4 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17215,8 +17215,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       it, as long as your weapon is strong enough.
   - rscadd: Energy shields now fade in and fade out, instead of just popping into
       existence.
+  - tweak: Ported Pipe- and Floor Painter sprites from Paradise.
   Karolis2011:
   - rscadd: Added back clock to modular computers.
   MoondancerPony:
   - backend: Gloves and mobs no longer keep a hardref to the mob whose blood they
       are covered in.
+  Wowzewow (Wezzy):
+  - bugfix: Fixes pAIs unfolding out of glass jars.
diff --git a/html/changelogs/geeves-cool_painters.yml b/html/changelogs/geeves-cool_painters.yml
deleted file mode 100644
index 2b7fb79c5db..00000000000
--- a/html/changelogs/geeves-cool_painters.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes:
-  - tweak: "Ported Pipe- and Floor Painter sprites from Paradise."
\ No newline at end of file
diff --git a/html/changelogs/wezzy_paiunfoldglassjarfix.yml b/html/changelogs/wezzy_paiunfoldglassjarfix.yml
deleted file mode 100644
index 4bdca630f6c..00000000000
--- a/html/changelogs/wezzy_paiunfoldglassjarfix.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 pAIs unfolding out of glass jars."