From 3d7430764f56564f7d482180a5bb5a42d65535a8 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 4 Aug 2019 19:14:52 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.08.04.19.14.52"

---
 html/changelog.html                 | 11 +++++++
 html/changelogs/.all_changelog.yml  | 13 ++++++++
 html/changelogs/Naelynn-PR-6791.yml | 48 -----------------------------
 3 files changed, 24 insertions(+), 48 deletions(-)
 delete mode 100644 html/changelogs/Naelynn-PR-6791.yml

diff --git a/html/changelog.html b/html/changelog.html
index 190b750f588..0c102a675ad 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,17 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added new player panel to make player management easier.</li>
 			</ul>
+			<h3 class="author">Naelynn updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Adjusted merchant economy. Traders also start with larger inventory</li>
+				<li class="tweak">Less list bloat - multiple traders reclassified as stations - should make getting high-demand stuff easier.</li>
+				<li class="tweak">Adjusted inventory of multiple traders (Food, robot, ai, electronics, vox, mining, blob)</li>
+				<li class="rscadd">Added options to sell certain items to food and mining merchants.</li>
+				<li class="rscdel">Deleted machine ai beacons selling plushies for no reason. Deleted Wizard merchant.</li>
+				<li class="rscadd">Added bulk-buy [boxes] to ai traders</li>
+				<li class="spellcheck">Fixed a few grammatical errors and inconsistensies</li>
+				<li class="rscadd">Added a completely new trader - Cyndie Kate is willing to trade you highly illegal and dangerous items</li>
+			</ul>
 			<h3 class="author">Skull132 by advice of Lohikar updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Shadows in open spaces were supposedly twice as dark as they should be.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8ec2a3e4baa..e3e97a943e1 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8668,6 +8668,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2019-08-04:
   Karolis2011:
   - rscadd: Added new player panel to make player management easier.
+  Naelynn:
+  - balance: Adjusted merchant economy. Traders also start with larger inventory
+  - tweak: Less list bloat - multiple traders reclassified as stations - should make
+      getting high-demand stuff easier.
+  - tweak: Adjusted inventory of multiple traders (Food, robot, ai, electronics, vox,
+      mining, blob)
+  - rscadd: 'Added options to sell certain items to food and mining merchants. '
+  - rscdel: Deleted machine ai beacons selling plushies for no reason. Deleted Wizard
+      merchant.
+  - rscadd: Added bulk-buy [boxes] to ai traders
+  - spellcheck: Fixed a few grammatical errors and inconsistensies
+  - rscadd: Added a completely new trader - Cyndie Kate is willing to trade you highly
+      illegal and dangerous items
   Skull132 by advice of Lohikar:
   - bugfix: Shadows in open spaces were supposedly twice as dark as they should be.
   VTCobaltblood:
diff --git a/html/changelogs/Naelynn-PR-6791.yml b/html/changelogs/Naelynn-PR-6791.yml
deleted file mode 100644
index d65355958b3..00000000000
--- a/html/changelogs/Naelynn-PR-6791.yml
+++ /dev/null
@@ -1,48 +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: 
-  - balance: "Adjusted merchant economy. Traders also start with larger inventory"
-  - tweak: "Less list bloat - multiple traders reclassified as stations - should make getting high-demand stuff easier."
-  - tweak: "Adjusted inventory of multiple traders (Food, robot, ai, electronics, vox, mining, blob)"
-  - rscadd: "Added options to sell certain items to food and mining merchants. "
-  - rscdel: "Deleted machine ai beacons selling plushies for no reason. Deleted Wizard merchant."
-  - rscadd: "Added bulk-buy [boxes] to ai traders" 
-  - spellcheck: "Fixed a few grammatical errors and inconsistensies"
-  - rscadd: "Added a completely new trader - Cyndie Kate is willing to trade you highly illegal and dangerous items"
\ No newline at end of file