From 79ed6ea531a71bbe72bd522bde60130fe7c2b94f Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 12 Jul 2019 18:12:23 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.07.12.18.12.23"

---
 html/changelog.html                 |  5 ++++
 html/changelogs/.all_changelog.yml  |  5 ++++
 html/changelogs/Sindorman-fixes.yml | 42 -----------------------------
 3 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/Sindorman-fixes.yml

diff --git a/html/changelog.html b/html/changelog.html
index 4b717bb1ff8..a75b144b60f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -66,6 +66,11 @@
 				<li class="maptweak">After some unforseen delays in delivery and manufacturing, a replacement Ian has been stationed on the Aurora.</li>
 				<li class="rscdel">Removed corgi meat from list of Cargo bounties.</li>
 			</ul>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed hostile mobs trajectory check. Allowing them to shoot mechs, shields, mobs, etc.</li>
+				<li class="tweak">Mechs no longer display message about armour delfecting trajectory test projectiles which have no damage.</li>
+			</ul>
 
 			<h2 class="date">11 July 2019</h2>
 			<h3 class="author">Ferner updated:</h3>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 2146ee06514..8fe6ae5bb28 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8402,3 +8402,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - maptweak: After some unforseen delays in delivery and manufacturing, a replacement
       Ian has been stationed on the Aurora.
   - rscdel: Removed corgi meat from list of Cargo bounties.
+  PoZe:
+  - bugfix: Fixed hostile mobs trajectory check. Allowing them to shoot mechs, shields,
+      mobs, etc.
+  - tweak: Mechs no longer display message about armour delfecting trajectory test
+      projectiles which have no damage.
diff --git a/html/changelogs/Sindorman-fixes.yml b/html/changelogs/Sindorman-fixes.yml
deleted file mode 100644
index 5cce3cd3b75..00000000000
--- a/html/changelogs/Sindorman-fixes.yml
+++ /dev/null
@@ -1,42 +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: "Fixed hostile mobs trajectory check. Allowing them to shoot mechs, shields, mobs, etc."
-  - tweak: "Mechs no longer display message about armour delfecting trajectory test projectiles which have no damage."