From cbf166cb102e14bd253a9d6123447bfbc47a7ba2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 25 Dec 2020 13:19:26 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.12.25.13.19.26"

---
 html/changelog.html                      |  2 ++
 html/changelogs/.all_changelog.yml       |  3 ++
 html/changelogs/arrow768-customitems.yml | 42 ------------------------
 3 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/arrow768-customitems.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2c746e9c196..fd816a3d127 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -39,6 +39,8 @@
 			<h3 class="author">Arrow768 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Unique character names are now enforced per player.</li>
+				<li class="refactor">Reworks the custom item system to be database-based.</li>
+				<li class="rscadd">The reason why a custom item could not be spawned is now displayed in the chat.</li>
 			</ul>
 			<h3 class="author">Geeves updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c71ad262d6a..0ae26ded63b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -17669,6 +17669,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-12-25:
   Arrow768:
   - rscadd: Unique character names are now enforced per player.
+  - refactor: Reworks the custom item system to be database-based.
+  - rscadd: The reason why a custom item could not be spawned is now displayed in
+      the chat.
   Geeves:
   - rscadd: Increased the amount of funds departments start with to 10k, up from 5k,
       except for the Cargo account.
diff --git a/html/changelogs/arrow768-customitems.yml b/html/changelogs/arrow768-customitems.yml
deleted file mode 100644
index 79e2ab10807..00000000000
--- a/html/changelogs/arrow768-customitems.yml
+++ /dev/null
@@ -1,42 +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: Arrow768
-
-# 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:
-  - refactor: "Reworks the custom item system to be database-based."
-  - rscadd: "The reason why a custom item could not be spawned is now displayed in the chat."