From c2e5ab1aa98237ccf8fc47a123e919085b95e1aa Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Wed, 22 Mar 2017 18:01:42 -0400
Subject: [PATCH] Changelogs, 23MAR2017 HAHA! It is TECHNICALLY 23MAR by local
 time now!

---
 html/changelog.html                  |  1 +
 html/changelogs/.all_changelog.yml   |  2 ++
 html/changelogs/Nanako-Vendorfix.yml | 36 ----------------------------
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 html/changelogs/Nanako-Vendorfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index e73805ae1d6..8b81690831a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -64,6 +64,7 @@
 			<h3 class="author">Nanako updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Slightly reduced the power of cult pylon turrets. This is an iterative process, they will be rebalanced gradually.</li>
+				<li class="bugfix">Fixed an exploit that allowed duplicating items in vendors and buying more than the vendor has.</li>
 			</ul>
 			<h3 class="author">Skull132 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 67246d2f1f0..3067f612cbc 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4021,6 +4021,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Nanako:
   - tweak: Slightly reduced the power of cult pylon turrets. This is an iterative
       process, they will be rebalanced gradually.
+  - bugfix: Fixed an exploit that allowed duplicating items in vendors and buying
+      more than the vendor has.
   Skull132:
   - tweak: Administrators can now invoke rename-synths verb by normally renaming a
       character from the VV panel.
diff --git a/html/changelogs/Nanako-Vendorfix.yml b/html/changelogs/Nanako-Vendorfix.yml
deleted file mode 100644
index 688a4421d47..00000000000
--- a/html/changelogs/Nanako-Vendorfix.yml
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.  
-author: Nanako
-
-# 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: "Fixed an exploit that allowed duplicating items in vendors and buying more than the vendor has."