From a09704f0dc2b36c16f6c7ec5188e47685bb0b9cb Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 7 Dec 2019 21:49:42 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.12.07.21.49.42"

---
 html/changelog.html                       |  8 +++++
 html/changelogs/.all_changelog.yml        |  5 +++
 html/changelogs/MerchantBulkBuy.yml       | 41 -----------------------
 html/changelogs/geeves - giga-shatter.yml |  6 ----
 4 files changed, 13 insertions(+), 47 deletions(-)
 delete mode 100644 html/changelogs/MerchantBulkBuy.yml
 delete mode 100644 html/changelogs/geeves - giga-shatter.yml

diff --git a/html/changelog.html b/html/changelog.html
index c37f9e456bd..9be2ebb053f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -42,11 +42,19 @@
 				<li class="rscdel">Removes seasonal pumpkin spice lattes from the vendors, to return next year.</li>
 				<li class="bugfix">Crafted donut boxes can hold six donuts again.</li>
 			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Gave Admins a gigashatter proc, which will fracture every single bone in your body. Fear the wrath of the redname.</li>
+			</ul>
 			<h3 class="author">JohnWildkins updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="backend">Ported BS12 fixes for visualnets.</li>
 				<li class="bugfix">Camera MIU and other non-AI eye mobs should no longer run into issues with obfuscation layers.</li>
 			</ul>
+			<h3 class="author">Naelynn updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added bulk-buy function to the merchant. Less spamming click to buy things!</li>
+			</ul>
 			<h3 class="author">Nero-07 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added the ability to force a holocall if you have a head id. Forced calls automatically go through and can only be ended by the sender stepping off the pad.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ac7f8b53556..e874de728f2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10435,10 +10435,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscdel: Removes seasonal pumpkin spice lattes from the vendors, to return next
       year.
   - bugfix: Crafted donut boxes can hold six donuts again.
+  Geeves:
+  - rscadd: Gave Admins a gigashatter proc, which will fracture every single bone
+      in your body. Fear the wrath of the redname.
   JohnWildkins:
   - backend: Ported BS12 fixes for visualnets.
   - bugfix: Camera MIU and other non-AI eye mobs should no longer run into issues
       with obfuscation layers.
+  Naelynn:
+  - rscadd: Added bulk-buy function to the merchant. Less spamming click to buy things!
   Nero-07:
   - rscadd: Added the ability to force a holocall if you have a head id. Forced calls
       automatically go through and can only be ended by the sender stepping off the
diff --git a/html/changelogs/MerchantBulkBuy.yml b/html/changelogs/MerchantBulkBuy.yml
deleted file mode 100644
index 65c14a61390..00000000000
--- a/html/changelogs/MerchantBulkBuy.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: Naelynn
-
-# 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: 
-  - rscadd: "Added bulk-buy function to the merchant. Less spamming click to buy things!"
diff --git a/html/changelogs/geeves - giga-shatter.yml b/html/changelogs/geeves - giga-shatter.yml
deleted file mode 100644
index 0de8d51089f..00000000000
--- a/html/changelogs/geeves - giga-shatter.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Geeves
-
-delete-after: True
-
-changes: 
-  - rscadd: "Gave Admins a gigashatter proc, which will fracture every single bone in your body. Fear the wrath of the redname."