From f0ec7d2e67ff55f34c1fae294da26a4ee7c13165 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 24 Dec 2018 22:14:40 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.12.24.22.14.40"

---
 html/changelog.html                        |  4 +++
 html/changelogs/.all_changelog.yml         |  4 +++
 html/changelogs/Sindorman-pinextractor.yml | 37 ----------------------
 3 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 html/changelogs/Sindorman-pinextractor.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0ab8eaf0396..00db7f98945 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,6 +61,10 @@
 			<ul class="changes bgimages16">
 				<li class="maptweak">Made the bar more festive.</li>
 			</ul>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added firing pin extraction device that can extract pins safely. The device will spawn inside the RD's locker. It can be printed in Protholate, but it is illegal to make these devices without head of staff approval.</li>
+			</ul>
 			<h3 class="author">Skull132 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Bluespace echos no longer broadcast what they say to everyone in the world.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d6212d40e0f..c6838ca0385 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6892,6 +6892,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2018-12-24:
   BurgerBB:
   - maptweak: Made the bar more festive.
+  PoZe:
+  - rscadd: Added firing pin extraction device that can extract pins safely. The device
+      will spawn inside the RD's locker. It can be printed in Protholate, but it is
+      illegal to make these devices without head of staff approval.
   Skull132:
   - bugfix: Bluespace echos no longer broadcast what they say to everyone in the world.
   - bugfix: Fixed an exploit which allowed players to teleport taped paper icons to
diff --git a/html/changelogs/Sindorman-pinextractor.yml b/html/changelogs/Sindorman-pinextractor.yml
deleted file mode 100644
index 2baff2372cc..00000000000
--- a/html/changelogs/Sindorman-pinextractor.yml
+++ /dev/null
@@ -1,37 +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
-#################################
-
-# 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 firing pin extraction device that can extract pins safely. The device will spawn inside the RD's locker. It can be printed in Protholate, but it is illegal to make these devices without head of staff approval."