From f26d1ccbddd5d067ba59fcd718c925f6054c1d16 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 16 Dec 2018 13:24:09 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.12.16.13.24.09"

---
 html/changelog.html                    |  9 ++++++
 html/changelogs/.all_changelog.yml     | 11 +++++++
 html/changelogs/Sindorman-bugfixes.yml | 42 --------------------------
 3 files changed, 20 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/Sindorman-bugfixes.yml

diff --git a/html/changelog.html b/html/changelog.html
index f9bf0204ab5..2273b4f997c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -63,6 +63,15 @@
 				<li class="balance">EMPing a bluespace inhibitor can have some fun effects.</li>
 				<li class="balance">Wizards can no longer randomly teleport on openspace tiles.</li>
 			</ul>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Straighjacket escape progress is no displayed above mob.</li>
+				<li class="spellcheck">Renamed cyborg Miner module into Mining.</li>
+				<li class="rscadd">Hostile mobs now check if they can see their target before moving towards or engaging.</li>
+				<li class="bugfix">Ranged hostile mobs no longer get in point blank range to shoot their target.</li>
+				<li class="bugfix">Security/Medical records sections max character limit was increases from 1024 to 3072, to keep it consistent with records in character setup.</li>
+				<li class="bugfix">Fixed turret sprites for Energy turret. Added lethal mode sprite and connected code wise to Ionrifle turret</li>
+			</ul>
 			<h3 class="author">VTCobaltblood updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Ports three hairstyles from Baystation: Gentle 2, Gentle 2 (Long) and Donut Bun.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 31781e41570..4000c9ec4e2 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6840,6 +6840,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       teleport.
   - balance: EMPing a bluespace inhibitor can have some fun effects.
   - balance: Wizards can no longer randomly teleport on openspace tiles.
+  PoZe:
+  - bugfix: Straighjacket escape progress is no displayed above mob.
+  - spellcheck: Renamed cyborg Miner module into Mining.
+  - rscadd: Hostile mobs now check if they can see their target before moving towards
+      or engaging.
+  - bugfix: Ranged hostile mobs no longer get in point blank range to shoot their
+      target.
+  - bugfix: Security/Medical records sections max character limit was increases from
+      1024 to 3072, to keep it consistent with records in character setup.
+  - bugfix: Fixed turret sprites for Energy turret. Added lethal mode sprite and connected
+      code wise to Ionrifle turret
   VTCobaltblood:
   - rscadd: 'Ports three hairstyles from Baystation: Gentle 2, Gentle 2 (Long) and
       Donut Bun.'
diff --git a/html/changelogs/Sindorman-bugfixes.yml b/html/changelogs/Sindorman-bugfixes.yml
deleted file mode 100644
index 99662baff94..00000000000
--- a/html/changelogs/Sindorman-bugfixes.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
-#################################
-
-# 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: "Straighjacket escape progress is no displayed above mob."
-  - spellcheck: "Renamed cyborg Miner module into Mining."
-  - rscadd: "Hostile mobs now check if they can see their target before moving towards or engaging."
-  - bugfix: "Ranged hostile mobs no longer get in point blank range to shoot their target."
-  - bugfix: "Security/Medical records sections max character limit was increases from 1024 to 3072, to keep it consistent with records in character setup."
-  - bugfix: "Fixed turret sprites for Energy turret. Added lethal mode sprite and connected code wise to Ionrifle turret"