From a2d2f4b0ee5e2c453334ed1431a4c5f68ee26c19 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 17 Dec 2019 15:29:05 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.12.17.15.29.05"

---
 html/changelog.html                 |  6 ++++
 html/changelogs/.all_changelog.yml  |  5 ++++
 html/changelogs/Sindorman-mechs.yml | 43 -----------------------------
 3 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/Sindorman-mechs.yml

diff --git a/html/changelog.html b/html/changelog.html
index 38ce7d328e0..37e362717fd 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,6 +46,12 @@
 				<li class="rscadd">Adds the ability to remove appendix and other organs in character setup.</li>
 				<li class="rscadd">Adds two kidneys! Splits the work up between the two organs.</li>
 			</ul>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Mechs no longer runtime during destroy call.</li>
+				<li class="bugfix">Turrets and NPCS no longer target empty mechs.</li>
+				<li class="bugfix">Mechs no longer runtime during armor check. Mechs now use their armor and values for it. Before it would ignore them entirely and deal 100% damage.</li>
+			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adds new forensic cards! Mark out your crimescene with these useless plastic cards! Can be found in boxes in Forensics.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a13ffed2200..06881d8e967 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10685,6 +10685,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Lady Fowl:
   - rscadd: Adds the ability to remove appendix and other organs in character setup.
   - rscadd: Adds two kidneys! Splits the work up between the two organs.
+  PoZe:
+  - bugfix: Mechs no longer runtime during destroy call.
+  - bugfix: Turrets and NPCS no longer target empty mechs.
+  - bugfix: Mechs no longer runtime during armor check. Mechs now use their armor
+      and values for it. Before it would ignore them entirely and deal 100% damage.
   Wowzewow (Wezzy):
   - rscadd: Adds new forensic cards! Mark out your crimescene with these useless plastic
       cards! Can be found in boxes in Forensics.
diff --git a/html/changelogs/Sindorman-mechs.yml b/html/changelogs/Sindorman-mechs.yml
deleted file mode 100644
index 31eee2b94a0..00000000000
--- a/html/changelogs/Sindorman-mechs.yml
+++ /dev/null
@@ -1,43 +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: 
-  - bugfix: "Mechs no longer runtime during destroy call."
-  - bugfix: "Turrets and NPCS no longer target empty mechs."
-  - bugfix: "Mechs no longer runtime during armor check. Mechs now use their armor and values for it. Before it would ignore them entirely and deal 100% damage."