From 667bfdb33f7da4519bcddb4520d9b78b441fa376 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 14 Dec 2019 20:46:24 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.12.14.20.46.24"

---
 html/changelog.html                |  7 +++++
 html/changelogs/.all_changelog.yml |  7 +++++
 html/changelogs/Sindorman-pens.yml | 44 ------------------------------
 3 files changed, 14 insertions(+), 44 deletions(-)
 delete mode 100644 html/changelogs/Sindorman-pens.yml

diff --git a/html/changelog.html b/html/changelog.html
index c489c601bfd..31329ead085 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -36,6 +36,13 @@
 		<div class="commit sansserif">
 
 			<h2 class="date">14 December 2019</h2>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added yellow and green pens</li>
+				<li class="tweak">Multi-color pens now also have yellow and green.</li>
+				<li class="rscadd">Added 4 special pens. Red pen - poison pen, blue pen - pacifier pen, green pen - healing pen, yellow pen - hyperzine pen.</li>
+				<li class="tweak">Added 4 special pens kit to traitor uplink, random kit and special ops cargo.</li>
+			</ul>
 			<h3 class="author">aleksix updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Re-introduced the min/max circuits for integrated circuitry</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c86304665fb..6ad96855c9f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10618,6 +10618,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Naelynn:
   - tweak: Fixed a rare bug making station safe impossible to crack.
 2019-12-14:
+  PoZe:
+  - rscadd: Added yellow and green pens
+  - tweak: Multi-color pens now also have yellow and green.
+  - rscadd: Added 4 special pens. Red pen - poison pen, blue pen - pacifier pen, green
+      pen - healing pen, yellow pen - hyperzine pen.
+  - tweak: Added 4 special pens kit to traitor uplink, random kit and special ops
+      cargo.
   aleksix:
   - rscadd: Re-introduced the min/max circuits for integrated circuitry
   - refactor: Borgs ID access code has been refactored to the normal ID access code.
diff --git a/html/changelogs/Sindorman-pens.yml b/html/changelogs/Sindorman-pens.yml
deleted file mode 100644
index d00e6a45315..00000000000
--- a/html/changelogs/Sindorman-pens.yml
+++ /dev/null
@@ -1,44 +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: PoZe
-
-# 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 yellow and green pens"
-  - tweak: "Multi-color pens now also have yellow and green."
-  - rscadd: "Added 4 special pens. Red pen - poison pen, blue pen - pacifier pen, green pen - healing pen, yellow pen - hyperzine pen."
-  - tweak: "Added 4 special pens kit to traitor uplink, random kit and special ops cargo."