From a7e368f284e2ec5481ed34ee174b65eca9eb9aa7 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Sat, 31 Mar 2018 23:23:18 +0300
Subject: [PATCH] Changelogs, 31MAR2018

---
 html/changelog.html                           |  8 ++++
 html/changelogs/.all_changelog.yml            |  7 ++++
 .../thegreatnacho - Ciggy_butt_brain.yml      | 37 -------------------
 .../thegreatnacho - changeling_charges.yml    | 37 -------------------
 .../thegreatnacho-my_diamond_spear.yml        | 37 -------------------
 5 files changed, 15 insertions(+), 111 deletions(-)
 delete mode 100644 html/changelogs/thegreatnacho - Ciggy_butt_brain.yml
 delete mode 100644 html/changelogs/thegreatnacho - changeling_charges.yml
 delete mode 100644 html/changelogs/thegreatnacho-my_diamond_spear.yml

diff --git a/html/changelog.html b/html/changelog.html
index b45f661585f..dbd633ecd34 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,14 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">31 March 2018</h2>
+			<h3 class="author">TheGreatNacho updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Set the sentencing machine and brig timer to read the convicts name from their ID, instead of their mob.</li>
+				<li class="bugfix">Fixed lighter being deleted when pulling a cigarette out of it's packet with your mouth.</li>
+				<li class="bugfix">Fixed spears losing their material after mounting head to them.</li>
+			</ul>
+
 			<h2 class="date">21 March 2018</h2>
 			<h3 class="author">BurgerBB updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d2771541432..0ab5c59973e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5249,3 +5249,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       slightly healthier.
   - balance: Lottery cards now generally give less, have 3 scratches per card, and
       take longer to scratch.
+2018-03-31:
+  TheGreatNacho:
+  - bugfix: Set the sentencing machine and brig timer to read the convicts name from
+      their ID, instead of their mob.
+  - bugfix: Fixed lighter being deleted when pulling a cigarette out of it's packet
+      with your mouth.
+  - bugfix: Fixed spears losing their material after mounting head to them.
diff --git a/html/changelogs/thegreatnacho - Ciggy_butt_brain.yml b/html/changelogs/thegreatnacho - Ciggy_butt_brain.yml
deleted file mode 100644
index 38c32949f52..00000000000
--- a/html/changelogs/thegreatnacho - Ciggy_butt_brain.yml	
+++ /dev/null
@@ -1,37 +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: TheGreatNacho
-
-# 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 lighter being deleted when pulling a cigarette out of it's packet with your mouth."
diff --git a/html/changelogs/thegreatnacho - changeling_charges.yml b/html/changelogs/thegreatnacho - changeling_charges.yml
deleted file mode 100644
index 7191f6e456b..00000000000
--- a/html/changelogs/thegreatnacho - changeling_charges.yml	
+++ /dev/null
@@ -1,37 +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: TheGreatNacho
-
-# 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: "Set the sentencing machine and brig timer to read the convicts name from their ID, instead of their mob."
\ No newline at end of file
diff --git a/html/changelogs/thegreatnacho-my_diamond_spear.yml b/html/changelogs/thegreatnacho-my_diamond_spear.yml
deleted file mode 100644
index 1362cde8036..00000000000
--- a/html/changelogs/thegreatnacho-my_diamond_spear.yml
+++ /dev/null
@@ -1,37 +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: TheGreatNacho
-
-# 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 spears losing their material after mounting head to them."