Merge branch 'yogstation13:master' into master

wonderinghost · Jan 20, 2024 · 3ecd37f · 3ecd37f
2 parents d386184 + 0ec192a
commit 3ecd37f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/html/changelog.html b/html/changelog.html
@@ -57,6 +57,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">20 January 2024</h2>
+			<h3 class="author"> kugamo, warface1234455 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Resprites the Bluespace Harvester.</li>
+				<li class="tweak">Also also slightly changes the nether portals event, so that the portals spawn sequentially over at most 15 seconds.</li>
+			</ul>
+
 			<h2 class="date">19 January 2024</h2>
 			<h3 class="author">SapphicOverload updated:</h3>
 			<ul class="changes bgimages16">
@@ -1521,24 +1528,6 @@ <h3 class="author">ynot01 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Syndi-kit Special's Oddjob kit no longer gives you a dummy landmine</li>
 			</ul>
-
-			<h2 class="date">21 October 2023</h2>
-			<h3 class="author">MajManatee updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Ripslugs and Anarchy buckshot!</li>
-				<li class="experiment">CRAZY ammo. Please send me more cool ideas.</li>
-			</ul>
-			<h3 class="author">Mqiib updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">(Nearly) doubles extinguisher damage against blazing oil blobs</li>
-				<li class="experiment">it's like I was right the whole time</li>
-			</ul>
-			<h3 class="author">cowbot92 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds new Heretic path</li>
-				<li class="soundadd">Adds a new sound for blade path</li>
-				<li class="imageadd">Adds new path blades</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
@@ -42856,3 +42856,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   warface1234455:
   - bugfix: Fix invisible netmin wintercoat hood
   - rscadd: Bring back Raven cruiser emergency shuttle
+2024-01-20:
+  ' kugamo, warface1234455':
+  - imageadd: Resprites the Bluespace Harvester.
+  - tweak: Also also slightly changes the nether portals event, so that the portals
+      spawn sequentially over at most 15 seconds.
diff --git a/html/changelogs/AutoChangelog-pr-21250.yml b/html/changelogs/AutoChangelog-pr-21250.yml