From f0a7197300a5939db86acad144e69ac424de8622 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Thu, 9 Apr 2020 22:18:50 -0700
Subject: [PATCH 1/2] changelog (#6965)

---
 html/changelog.html                          | 17 +++++++++
 html/changelogs/.all_changelog.yml           | 17 +++++++++
 html/changelogs/atermonera_headphone_fix.yml |  4 --
 html/changelogs/neerti-medical_qol_1.yml     | 39 --------------------
 html/changelogs/novacat - sniperqol.yml      | 36 ------------------
 5 files changed, 34 insertions(+), 79 deletions(-)
 delete mode 100644 html/changelogs/atermonera_headphone_fix.yml
 delete mode 100644 html/changelogs/neerti-medical_qol_1.yml
 delete mode 100644 html/changelogs/novacat - sniperqol.yml

diff --git a/html/changelog.html b/html/changelog.html
index 23f72b4800..e345663e70 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,23 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">05 April 2020</h2>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Headphones (and other two-ear clothing items) don't break the off-ear slot when click-dragged to unequip.</li>
+			</ul>
+			<h3 class="author">Neerti updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The eject button on both the Chemical Dispenser and Chem Master will place the ejected beaker into your hands, instead of on top of the machine, if possible. (Requested by Nalarac.)</li>
+				<li class="tweak">Suit sensor consoles now display a friendly textual indicator of what z-level someone is on, instead of a number. They will also now avoid spoiling the names of Points of Interest.</li>
+				<li class="tweak">The beakers containing Cryoxadone near cryogenics are now labeled. (Requested by Nalarac.)</li>
+				<li class="bugfix">The sleeper consoles now finally face towards the sleepers, at last. It only took a year for someone to fix it.</li>
+			</ul>
+			<h3 class="author">novacat updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds action buttons for scoping all sniper weapons.</li>
+			</ul>
+
 			<h2 class="date">27 March 2020</h2>
 			<h3 class="author">Arokha updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4c1602a2a3..5f691beb23 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5065,3 +5065,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Adds emergency backup cells to most light fixtures
   - tweak: AIs can turn emergency lighting on and off by clicking light fixtures.
       Flickering the lights has been moved to alt-click.
+2020-04-05:
+  Atermonera:
+  - bugfix: Headphones (and other two-ear clothing items) don't break the off-ear
+      slot when click-dragged to unequip.
+  Neerti:
+  - tweak: The eject button on both the Chemical Dispenser and Chem Master will place
+      the ejected beaker into your hands, instead of on top of the machine, if possible.
+      (Requested by Nalarac.)
+  - tweak: Suit sensor consoles now display a friendly textual indicator of what z-level
+      someone is on, instead of a number. They will also now avoid spoiling the names
+      of Points of Interest.
+  - tweak: The beakers containing Cryoxadone near cryogenics are now labeled. (Requested
+      by Nalarac.)
+  - bugfix: The sleeper consoles now finally face towards the sleepers, at last. It
+      only took a year for someone to fix it.
+  novacat:
+  - rscadd: Adds action buttons for scoping all sniper weapons.
diff --git a/html/changelogs/atermonera_headphone_fix.yml b/html/changelogs/atermonera_headphone_fix.yml
deleted file mode 100644
index f84ca57434..0000000000
--- a/html/changelogs/atermonera_headphone_fix.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Atermonera
-delete-after: True
-changes: 
-  - bugfix: "Headphones (and other two-ear clothing items) don't break the off-ear slot when click-dragged to unequip."
diff --git a/html/changelogs/neerti-medical_qol_1.yml b/html/changelogs/neerti-medical_qol_1.yml
deleted file mode 100644
index 346c3042c5..0000000000
--- a/html/changelogs/neerti-medical_qol_1.yml
+++ /dev/null
@@ -1,39 +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
-#################################
-
-# Your name.  
-author: Neerti
-
-# 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: "The eject button on both the Chemical Dispenser and Chem Master will place the ejected beaker into your hands, instead of on top of the machine, if possible. (Requested by Nalarac.)"
-  - tweak: "Suit sensor consoles now display a friendly textual indicator of what z-level someone is on, instead of a number. They will also now avoid spoiling the names of Points of Interest."
-  - tweak: "The beakers containing Cryoxadone near cryogenics are now labeled. (Requested by Nalarac.)"
-  - bugfix: "The sleeper consoles now finally face towards the sleepers, at last. It only took a year for someone to fix it."
diff --git a/html/changelogs/novacat - sniperqol.yml b/html/changelogs/novacat - sniperqol.yml
deleted file mode 100644
index bc7ce5fe9b..0000000000
--- a/html/changelogs/novacat - sniperqol.yml	
+++ /dev/null
@@ -1,36 +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
-#################################
-
-# Your name.  
-author: novacat
-
-# 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: 
-  - rscadd: "Adds action buttons for all sniper weapons."