From ce7a1624f5a95c85c2bba4a3178deaa02dc2b5a1 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 2 Nov 2019 17:41:43 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.11.02.17.41.43"

---
 html/changelog.html                   | 12 +++++++
 html/changelogs/.all_changelog.yml    | 17 ++++++++++
 html/changelogs/johnwildkins-7201.yml | 49 ---------------------------
 3 files changed, 29 insertions(+), 49 deletions(-)
 delete mode 100644 html/changelogs/johnwildkins-7201.yml

diff --git a/html/changelog.html b/html/changelog.html
index df4b32fdd70..57761523c16 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,6 +46,18 @@
 				<li class="tweak">Improved sword parry sounds.</li>
 				<li class="rscdel">Robotics can no longer fabricate knock-off stealth RIGs.</li>
 			</ul>
+			<h3 class="author">JohnWildkins updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">With the gripper, hitting the drop hotkey (Q) now drops the held item. If there is no held item, the gripper is put away as normal.</li>
+				<li class="tweak">The scientific gripper can now hold slime steroids.</li>
+				<li class="tweak">The chemistry gripper can now hold paper. This is mostly to assist medical borgs handling scans and the like.</li>
+				<li class="bugfix">Modules relying on cyborg synthesizers (nanopaste, ATKs, etc.) now cannot be used once the synthesizer is depleted.</li>
+				<li class="bugfix">Injecting a monkey cube in a cyborg gripper no longer places the monkey inside the gripper's pocket dimension.</li>
+				<li class="bugfix">Service cyborgs can no longer open a plane to infinite grass tiles via their service gripper.</li>
+				<li class="bugfix">Cyborgs can now re-lock secure crates.</li>
+				<li class="bugfix">Clerical cyborgs can now browse paper bundles and pick up duct-taped paper with their gripper.</li>
+				<li class="bugfix">The cyborg module inventory now correctly updates when using the drop hotkey (Q, default) to put away a module.</li>
+			</ul>
 			<h3 class="author">MattAtlas updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Removed fullblock chance in normal circumstances. This means you shouldn't ever have your armor absorb bullets completely unless your armor is much stronger than the bullet you're receiving.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a0e10a153d8..9e8fc680f30 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9695,6 +9695,23 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Geeves:
   - tweak: Improved sword parry sounds.
   - rscdel: Robotics can no longer fabricate knock-off stealth RIGs.
+  JohnWildkins:
+  - tweak: With the gripper, hitting the drop hotkey (Q) now drops the held item.
+      If there is no held item, the gripper is put away as normal.
+  - tweak: The scientific gripper can now hold slime steroids.
+  - tweak: The chemistry gripper can now hold paper. This is mostly to assist medical
+      borgs handling scans and the like.
+  - bugfix: Modules relying on cyborg synthesizers (nanopaste, ATKs, etc.) now cannot
+      be used once the synthesizer is depleted.
+  - bugfix: Injecting a monkey cube in a cyborg gripper no longer places the monkey
+      inside the gripper's pocket dimension.
+  - bugfix: Service cyborgs can no longer open a plane to infinite grass tiles via
+      their service gripper.
+  - bugfix: Cyborgs can now re-lock secure crates.
+  - bugfix: Clerical cyborgs can now browse paper bundles and pick up duct-taped paper
+      with their gripper.
+  - bugfix: The cyborg module inventory now correctly updates when using the drop
+      hotkey (Q, default) to put away a module.
   MattAtlas:
   - tweak: Removed fullblock chance in normal circumstances. This means you shouldn't
       ever have your armor absorb bullets completely unless your armor is much stronger
diff --git a/html/changelogs/johnwildkins-7201.yml b/html/changelogs/johnwildkins-7201.yml
deleted file mode 100644
index 24b41275017..00000000000
--- a/html/changelogs/johnwildkins-7201.yml
+++ /dev/null
@@ -1,49 +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: JohnWildkins
-
-# 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: "With the gripper, hitting the drop hotkey (Q) now drops the held item. If there is no held item, the gripper is put away as normal."
-  - tweak: "The scientific gripper can now hold slime steroids."
-  - tweak: "The chemistry gripper can now hold paper. This is mostly to assist medical borgs handling scans and the like."
-  - bugfix: "Modules relying on cyborg synthesizers (nanopaste, ATKs, etc.) now cannot be used once the synthesizer is depleted."
-  - bugfix: "Injecting a monkey cube in a cyborg gripper no longer places the monkey inside the gripper's pocket dimension."
-  - bugfix: "Service cyborgs can no longer open a plane to infinite grass tiles via their service gripper."
-  - bugfix: "Cyborgs can now re-lock secure crates."
-  - bugfix: "Clerical cyborgs can now browse paper bundles and pick up duct-taped paper with their gripper."
-  - bugfix: "The cyborg module inventory now correctly updates when using the drop hotkey (Q, default) to put away a module."