From b98dd340163e534e7c77a36dcf0e2176a75ad3b2 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Mon, 8 Jun 2020 09:33:38 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.08.09.33.38"

---
 html/changelog.html                      | 16 +++++++++
 html/changelogs/.all_changelog.yml       | 17 ++++++++++
 html/changelogs/geeves-laser_shotgun.yml | 10 ------
 html/changelogs/mattatlas-nerfmed.yml    | 43 ------------------------
 4 files changed, 33 insertions(+), 53 deletions(-)
 delete mode 100644 html/changelogs/geeves-laser_shotgun.yml
 delete mode 100644 html/changelogs/mattatlas-nerfmed.yml

diff --git a/html/changelog.html b/html/changelog.html
index 0256013af36..9012323d35b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,22 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">08 June 2020</h2>
+			<h3 class="author">Code by Geeves, Sprites by Kyres updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Tweaked the laser shotgun sprite. Renamed it to laser shotgun, instead of quad-beam laser.</li>
+				<li class="tweak">Buffed the laser shotgun damage from 15 burn, to 20. Increased the max shots from 12 to 20, which is 5 bursts. It can now be wielded.</li>
+				<li class="rscadd">Added two expedition laser shotguns to the research shuttle. They can only be fired when off-station.</li>
+				<li class="tweak">Burst weapons now only emote you firing them the first time, if their burst delay is low and they burst amount is low.</li>
+				<li class="rscadd">Added testing range and away site firing pins to the modular gun protolathe category.</li>
+			</ul>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Roller beds now have integrated IVs.</li>
+				<li class="rscdel">Atropine has been removed.</li>
+				<li class="tweak">Most random chemicals that healed organ damage - like tea - no longer do so. Rest assured though, medical chemicals that heal organ damage still do.</li>
+			</ul>
+
 			<h2 class="date">07 June 2020</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 065798f2213..a5373f13248 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13539,3 +13539,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Firearms should now be more responsive and less janky with movement and
       fire delays.
   - bugfix: Pointblanks no longer put a huge space before the pointblanked's name.
+2020-06-08:
+  Code by Geeves, Sprites by Kyres:
+  - tweak: Tweaked the laser shotgun sprite. Renamed it to laser shotgun, instead
+      of quad-beam laser.
+  - tweak: Buffed the laser shotgun damage from 15 burn, to 20. Increased the max
+      shots from 12 to 20, which is 5 bursts. It can now be wielded.
+  - rscadd: Added two expedition laser shotguns to the research shuttle. They can
+      only be fired when off-station.
+  - tweak: Burst weapons now only emote you firing them the first time, if their burst
+      delay is low and they burst amount is low.
+  - rscadd: Added testing range and away site firing pins to the modular gun protolathe
+      category.
+  MattAtlas:
+  - rscadd: Roller beds now have integrated IVs.
+  - rscdel: Atropine has been removed.
+  - tweak: Most random chemicals that healed organ damage - like tea - no longer do
+      so. Rest assured though, medical chemicals that heal organ damage still do.
diff --git a/html/changelogs/geeves-laser_shotgun.yml b/html/changelogs/geeves-laser_shotgun.yml
deleted file mode 100644
index daae6d1d7f7..00000000000
--- a/html/changelogs/geeves-laser_shotgun.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: Code by Geeves, Sprites by Kyres
-
-delete-after: True
-
-changes: 
-  - tweak: "Tweaked the laser shotgun sprite. Renamed it to laser shotgun, instead of quad-beam laser."
-  - tweak: "Buffed the laser shotgun damage from 15 burn, to 20. Increased the max shots from 12 to 20, which is 5 bursts. It can now be wielded."
-  - rscadd: "Added two expedition laser shotguns to the research shuttle. They can only be fired when off-station."
-  - tweak: "Burst weapons now only emote you firing them the first time, if their burst delay is low and they burst amount is low."
-  - rscadd: "Added testing range and away site firing pins to the modular gun protolathe category."
\ No newline at end of file
diff --git a/html/changelogs/mattatlas-nerfmed.yml b/html/changelogs/mattatlas-nerfmed.yml
deleted file mode 100644
index b17507a4e4f..00000000000
--- a/html/changelogs/mattatlas-nerfmed.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: MattAtlas
-
-# 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: "Roller beds now have integrated IVs."
-  - rscdel: "Atropine has been removed."
-  - tweak: "Most random chemicals that healed organ damage - like tea - no longer do so. Rest assured though, medical chemicals that heal organ damage still do."