From 8c5e4e2cfa908da5d1ced357187b2a87aa375e5f Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 13 Dec 2019 14:25:23 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.12.13.14.25.23"

---
 html/changelog.html                           | 1 +
 html/changelogs/.all_changelog.yml            | 3 +++
 html/changelogs/doxxmedearly - spraymemes.yml | 9 ---------
 3 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 html/changelogs/doxxmedearly - spraymemes.yml

diff --git a/html/changelog.html b/html/changelog.html
index 3518e32aa1b..8b03c2ea58e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -44,6 +44,7 @@
 				<li class="rscadd">You can brush most friendly animals. Combs work for fuzzy and feathered animals, rags work on other ones.</li>
 				<li class="tweak">There's a small chance that when you pet a guard dog (like Columbo) on help intent (and aren't his master), he won't immediately maul your face off; instead, he will growl at you to warn you not to do that. I still don't recommend it.</li>
 				<li class="tweak">Like other pets, baby carp can eat now. But not a lot.</li>
+				<li class="bugfix">You'll no longer spray yourself with bottles or pepperspray when placing it into your bag, jacket, webbing, or a container you're holding, even with the safety off.</li>
 			</ul>
 			<h3 class="author">Ferner updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 808b7a9f421..372bddcb5bd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -10605,6 +10605,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       instead, he will growl at you to warn you not to do that. I still don't recommend
       it.
   - tweak: Like other pets, baby carp can eat now. But not a lot.
+  - bugfix: You'll no longer spray yourself with bottles or pepperspray when placing
+      it into your bag, jacket, webbing, or a container you're holding, even with
+      the safety off.
   Ferner:
   - tweak: Flags can now be placed onto windows directly.
   Naelynn:
diff --git a/html/changelogs/doxxmedearly - spraymemes.yml b/html/changelogs/doxxmedearly - spraymemes.yml
deleted file mode 100644
index 421dabab5df..00000000000
--- a/html/changelogs/doxxmedearly - spraymemes.yml	
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Your name.  
-author: Doxxmedearly
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-changes: 
-  - bugfix: "You'll no longer spray yourself with bottles or pepperspray when placing it into your bag, jacket, webbing, or a container you're holding, even with the safety off."