From ea1be4ff6531faafc9ab45c3a166bd7080ab13c1 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 4 Dec 2018 09:21:26 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.12.04.09.21.26"

---
 html/changelog.html                 |  5 ++++
 html/changelogs/.all_changelog.yml  |  4 +++
 html/changelogs/weapondesignfix.yml | 38 -----------------------------
 3 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 html/changelogs/weapondesignfix.yml

diff --git a/html/changelog.html b/html/changelog.html
index c24a01dd4af..6ee75646520 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -62,6 +62,11 @@
 				<li class="bugfix">Removed the anomalous Medbay tile and Air Alarm in Space.</li>
 				<li class="maptweak">Put an Air Alarm and Fire Alarm in the Surface Checkpoint.</li>
 			</ul>
+			<h3 class="author">Scheveningen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes an issue where certain R&D parts were not appearing in the protolathe to be built.</li>
+				<li class="tweak">Fixes an issue where certain R&D parts had unobtainable research requirements.</li>
+			</ul>
 
 			<h2 class="date">03 December 2018</h2>
 			<h3 class="author">Furrycactus updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8a87ea26be8..aaab74c2c12 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6686,3 +6686,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Furrycactus:
   - bugfix: Removed the anomalous Medbay tile and Air Alarm in Space.
   - maptweak: Put an Air Alarm and Fire Alarm in the Surface Checkpoint.
+  Scheveningen:
+  - bugfix: Fixes an issue where certain R&D parts were not appearing in the protolathe
+      to be built.
+  - tweak: Fixes an issue where certain R&D parts had unobtainable research requirements.
diff --git a/html/changelogs/weapondesignfix.yml b/html/changelogs/weapondesignfix.yml
deleted file mode 100644
index 72c83812632..00000000000
--- a/html/changelogs/weapondesignfix.yml
+++ /dev/null
@@ -1,38 +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: Scheveningen
-
-# 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: "Fixes an issue where certain R&D parts were not appearing in the protolathe to be built."
-  - tweak: "Fixes an issue where certain R&D parts had unobtainable research requirements."