Merge branch 'master' into pr/22301

Author: cowbot92

code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm

@@ -135,7 +135,7 @@
 	if(!istype(location))
 		return FALSE
 
-	for(var/turf/spread_turf as anything in location.reachableAdjacentTurfs())
+	for(var/turf/spread_turf as anything in location.reachableAdjacentAtmosTurfs())
 		var/obj/effect/particle_effect/fluid/foam/foundfoam = locate() in spread_turf //Don't spread foam where there's already foam!
 		if(foundfoam)
 			continue

html/changelog.html

@@ -57,6 +57,16 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">22 December 2024</h2>
+			<h3 class="author">Oblisk234 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Set next minetype verb is now more clear and actually tells you what minetype is set.</li>
+			</ul>
+			<h3 class="author">warface1234455 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Allows foam to spread through density objects</li>
+			</ul>
+
 			<h2 class="date">20 December 2024</h2>
 			<h3 class="author">Identification updated:</h3>
 			<ul class="changes bgimages16">
@@ -726,32 +736,6 @@ <h3 class="author">AMyriad updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed unused synthetic storage units being obtainable</li>
 			</ul>
-
-			<h2 class="date">22 September 2024</h2>
-			<h3 class="author">Aquizit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">QM PDA comes with Bot Controller pre-installed</li>
-			</ul>
-			<h3 class="author">Chubbygummibear updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Weather planemasters</li>
-				<li class="bugfix">multi-z weather overlays stacking</li>
-				<li class="tweak">changed some plane values</li>
-			</ul>
-			<h3 class="author">Moltijoe updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Removes styptic powder and silver sulfadiazine vials from the Hypovendor</li>
-				<li class="bugfix">Hides synthetics from the job menu</li>
-			</ul>
-			<h3 class="author">SapphicOverload updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="experiment">Completely reworked sleeping carp, exact details can be found on github or by using "recall teachings" in-game.</li>
-				<li class="imageadd">Added a shield overlay effect to indicate a sleeping carp user's focus level.</li>
-			</ul>
-			<h3 class="author">ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Department antag gimmicks never pick your department</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -45812,3 +45812,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       slot icon.
   Moltijoe:
   - bugfix: Should fix station goals never triggering
+2024-12-22:
+  Oblisk234:
+  - tweak: Set next minetype verb is now more clear and actually tells you what minetype
+      is set.
+  warface1234455:
+  - rscadd: Allows foam to spread through density objects

yogstation/code/modules/admin/admin_verbs.dm

@@ -108,6 +108,6 @@
 	var/answer = input(src,"Which one do you choose?","Selection","Either") in l
 	if(!answer)
 		return
-	message_admins("[src] the next minetype was picked.")
-	log_admin("[src] picked the next minetype.")
+	message_admins("[src] set the next minetype to [answer].")
+	log_admin("[src] set the next minetype to [answer].")
 	SSpersistence.SaveMinetype(l[answer])