Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos

html/changelog.html

@@ -58,6 +58,17 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">21 December 2021</h2>
+			<h3 class="author">  TheGamerdk & Alexkar598 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Your sound preferences should no longer be reverted if you have enabled alternative sounds and VOX</li>
+			</ul>
+			<h3 class="author">cuackles updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new chaplain and robo suit</li>
+				<li class="imageadd">added some icons and images  for said suit</li>
+			</ul>
+
 			<h2 class="date">20 December 2021</h2>
 			<h3 class="author"> Lucy updated:</h3>
 			<ul class="changes bgimages16">
@@ -1404,21 +1415,6 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">removed a stray pixel on the vomit goose undershirt</li>
 			</ul>
-
-			<h2 class="date">21 September 2021</h2>
-			<h3 class="author">Anvilman6 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Sheltered's descriptive texts now properly reflect what it does.</li>
-				<li class="tweak">Reduces the quirk balance of Sheltered from 3 to 1, as it is now only a Galactic Common Mute quirk.</li>
-			</ul>
-			<h3 class="author">KillerOrcaCora updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Resprited Signal Tech cape to look better and complement their colors.</li>
-			</ul>
-			<h3 class="author">nmajask updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">replaced the freezers with blood in it with blood freezers in box medbay</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -29633,3 +29633,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   cuackles:
   - bugfix: fixed a few things
   - tweak: tweaked a few things
+2021-12-21:
+  '  TheGamerdk & Alexkar598':
+  - bugfix: Your sound preferences should no longer be reverted if you have enabled
+      alternative sounds and VOX
+  cuackles:
+  - rscadd: Added new chaplain and robo suit
+  - imageadd: added some icons and images  for said suit

html/changelogs/AutoChangelog-pr-12892.yml

@@ -1,5 +0,0 @@
-author: "cuackles"
-delete-after: true 
-changes: 
-  - rscadd: "Added new chaplain and robo suit"
-  - imageadd: "added some icons and images  for said suit"

html/changelogs/AutoChangelog-pr-12943.yml

@@ -1,4 +0,0 @@
-author: "  TheGamerdk & Alexkar598"
-delete-after: true 
-changes: 
-  - bugfix: "Your sound preferences should no longer be reverted if you have enabled alternative sounds and VOX"