From 7ea1aae2c41f5d2e5e49cc0d1226a12b0435a491 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 25 Jul 2020 00:33:53 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.07.25.00.33.53"

---
 html/changelog.html                         |  8 ++++
 html/changelogs/.all_changelog.yml          | 10 +++++
 html/changelogs/stationbound_law_rework.yml | 43 ---------------------
 3 files changed, 18 insertions(+), 43 deletions(-)
 delete mode 100644 html/changelogs/stationbound_law_rework.yml

diff --git a/html/changelog.html b/html/changelog.html
index 3fdd048bb23..71ca5815680 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,14 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">25 July 2020</h2>
+			<h3 class="author">Chada updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Added the Synthetic prime directive to the 'borg Laws in the form of preserve which creates a form of fear RP for 'borgs.</li>
+				<li class="tweak">Altered all of the laws to have more clear phrasing, now it should be a lot harder to stretch them to enable undesirable behavior and have what could be construed as valid justifications.</li>
+				<li class="tweak">Added a clause for general crew to the Stationbound laws and separated it from NanoTrasen only, so it takes into account contractors, merchants and general visitors..</li>
+			</ul>
+
 			<h2 class="date">24 July 2020</h2>
 			<h3 class="author">Doxxmedearly updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f1b90624e5c..fdbfdebc9dd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14378,3 +14378,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - backend: Passing arguments to elements will now work.
   - bugfix: Hearing aids should now allow deaf characters to hear holocomms, radios,
       etc.
+2020-07-25:
+  Chada:
+  - tweak: Added the Synthetic prime directive to the 'borg Laws in the form of preserve
+      which creates a form of fear RP for 'borgs.
+  - tweak: Altered all of the laws to have more clear phrasing, now it should be a
+      lot harder to stretch them to enable undesirable behavior and have what could
+      be construed as valid justifications.
+  - tweak: Added a clause for general crew to the Stationbound laws and separated
+      it from NanoTrasen only, so it takes into account contractors, merchants and
+      general visitors..
diff --git a/html/changelogs/stationbound_law_rework.yml b/html/changelogs/stationbound_law_rework.yml
deleted file mode 100644
index 45870c1667d..00000000000
--- a/html/changelogs/stationbound_law_rework.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: Chada
-
-# 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: "Added the Synthetic prime directive to the 'borg Laws in the form of preserve which creates a form of fear RP for 'borgs."
-  - tweak: "Altered all of the laws to have more clear phrasing, now it should be a lot harder to stretch them to enable undesirable behavior and have what could be construed as valid justifications."
-  - tweak: "Added a clause for general crew to the Stationbound laws and separated it from NanoTrasen only, so it takes into account contractors, merchants and general visitors.."