From 667f4ead588e5bf0ca290de246a3a7d8c4291f2f Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Sat, 14 Jul 2018 15:33:35 +0000
Subject: [PATCH] Automatic changelog compile, [ci skip]

---
 html/changelog.html                        | 4 ++++
 html/changelogs/.all_changelog.yml         | 3 +++
 html/changelogs/AutoChangeLog-pr-39114.yml | 4 ----
 3 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-39114.yml

diff --git a/html/changelog.html b/html/changelog.html
index 6e08558b6f3..dcc16df0bfa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,10 @@
 		-->
 		<div class="commit sansserif">
 			<h2 class="date">14 July 2018</h2>
+			<h3 class="author">Naksu updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">stamina damage is no longer softcapped by the unconsciousness trigger lowering stamina damage a little bit</li>
+			</ul>
 			<h3 class="author">ShizCalev updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">The SM is now even more deadly to "certain mobs"™</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 45e8d79313c..060273b2b2a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -19003,5 +19003,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - balance: The alien pistol and the xray gun have both received a much belated buff
       to their radiation damage to be on par with other sources of radiation.
 2018-07-14:
+  Naksu:
+  - balance: stamina damage is no longer softcapped by the unconsciousness trigger
+      lowering stamina damage a little bit
   ShizCalev:
   - tweak: "The SM is now even more deadly to \"certain mobs\"\u2122"
diff --git a/html/changelogs/AutoChangeLog-pr-39114.yml b/html/changelogs/AutoChangeLog-pr-39114.yml
deleted file mode 100644
index 772efb943af..00000000000
--- a/html/changelogs/AutoChangeLog-pr-39114.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes: 
-  - balance: "stamina damage is no longer softcapped by the unconsciousness trigger lowering stamina damage a little bit"