Merge branch 'BeeStation:master' into energy-weapon-gameplay

BeeStation · Jun 9, 2024 · 506c1f8 · 506c1f8
2 parents feb5d39 + 06c43b6
commit 506c1f8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 
 #Ignore byond config folder.
 /cfg/**/*
+config/starmap/starmap.json
 
 # Ignore compiled linux libs in the root folder, e.g. librust_g.so
 /*.so

diff --git a/html/changelog.html b/html/changelog.html
@@ -149,13 +149,6 @@ <h3 class="author">KasparoVy updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">added more custom prosthetic sprites</li>
 			</ul>
-
-			<h2 class="date">01 April 2024</h2>
-			<h3 class="author">Bokkiewokkie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed auto-spooling not working for the Thirring FTL drive.</li>
-				<li class="balance">Enabled auto-spooling as an option for the Thirring FTL drive by default.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>