From 7109e22c3fd0c5719ae9110dcd27ccbd93107ce5 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sat, 20 Jul 2019 12:26:34 -0500
Subject: [PATCH 1/2] Merge pull request #6313 from Atermonera/changelog

itty bitty changelog
---
 html/changelog.html                           | 12 ++++++
 html/changelogs/.all_changelog.yml            |  8 ++++
 ...eFurryFeline - Nalarac's Farmbot Tweak.yml | 36 ------------------
 html/changelogs/maptweaksv3 - Woodrat.yml     | 38 -------------------
 4 files changed, 20 insertions(+), 74 deletions(-)
 delete mode 100644 html/changelogs/TheFurryFeline - Nalarac's Farmbot Tweak.yml
 delete mode 100644 html/changelogs/maptweaksv3 - Woodrat.yml

diff --git a/html/changelog.html b/html/changelog.html
index 7a0461244cb..fab075d8ed7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,18 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">19 July 2019</h2>
+			<h3 class="author">Nalarac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Add xenobio/xenobot to farmbots.</li>
+			</ul>
+			<h3 class="author">Woodrat updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added a clotting kit to the Raider Shuttle.</li>
+				<li class="tweak">Swapped out the ai turrets for industrial turrets in the teleporter rooms.</li>
+				<li class="tweak">Adjusted access to the turret controls to heads of staff access, moved them outside of the rooms.</li>
+			</ul>
+
 			<h2 class="date">07 July 2019</h2>
 			<h3 class="author">Heroman3003 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 84bda2f98b0..30c75a1917b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4614,3 +4614,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       on an invalid Z-level.
   - bugfix: Fixes GPSes not detecting other GPSes while on an invalid Z-level. Transit
       Z is unaffected by this- no spying on other shuttles!
+2019-07-19:
+  Nalarac:
+  - tweak: Add xenobio/xenobot to farmbots.
+  Woodrat:
+  - rscadd: Added a clotting kit to the Raider Shuttle.
+  - tweak: Swapped out the ai turrets for industrial turrets in the teleporter rooms.
+  - tweak: Adjusted access to the turret controls to heads of staff access, moved
+      them outside of the rooms.
diff --git a/html/changelogs/TheFurryFeline - Nalarac's Farmbot Tweak.yml b/html/changelogs/TheFurryFeline - Nalarac's Farmbot Tweak.yml
deleted file mode 100644
index 179f66329a8..00000000000
--- a/html/changelogs/TheFurryFeline - Nalarac's Farmbot Tweak.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: TheFurryFeline
-
-# 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: 
-  - tweak: "Add access_xenobiology to farmbots."
\ No newline at end of file
diff --git a/html/changelogs/maptweaksv3 - Woodrat.yml b/html/changelogs/maptweaksv3 - Woodrat.yml
deleted file mode 100644
index a3bb4b8ebf1..00000000000
--- a/html/changelogs/maptweaksv3 - Woodrat.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
-#################################
-
-# Your name.  
-author: Woodrat
-
-# 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 a clotting kit to the Raider Shuttle."
-  - tweak: "swapped out the ai turrets for industrial turrets in the teleporter rooms."
-  - tweak: "Adjusted access to the turret controls to heads of staff access, moved them outside of the rooms."