Merge remote-tracking branch 'upstream/master'

code/game/objects/items/singularityhammer.dm

@@ -112,7 +112,7 @@
 		if(A)
 			if(isitem(A))
 				M.visible_message(span_warning("[M]'s [A] glows brightly as it disrupts the Mjolnir's power!"))
-			visible_message(span_boldwarning("<span class='big bold'>With a mighty thud, Mjolnier slams into the [src.loc], and its glow fades!</span><br>"))
+			visible_message(span_boldwarning("<span class='big bold'>With a mighty thud, Mjolnir slams into the [src.loc], and its glow fades!</span><br>"))
 			playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1, extrarange = 30)
 			new /obj/structure/mjollnir(src.loc)
 			qdel(src)

html/changelog.html

@@ -58,6 +58,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 March 2022</h2>
+			<h3 class="author">  Identification updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Telescopic batons are now a discernible shape</li>
+			</ul>
+			<h3 class="author">Chubbygummibear updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Throwing Mjolnier into someone with anti-magic makes it go bye bye in a big boom</li>
+			</ul>
+			<h3 class="author">ToasterBiome updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">removes erroneous admin logging that is not needed</li>
+			</ul>
+
 			<h2 class="date">16 March 2022</h2>
 			<h3 class="author">Marmio64 updated:</h3>
 			<ul class="changes bgimages16">
@@ -1226,17 +1240,6 @@
 				<li class="tweak">adds lights to ai core airlock</li>
 				<li class="bugfix">fixes exterior airlock button opening interior airlock</li>
 			</ul>
-
-			<h2 class="date">16 December 2021</h2>
-			<h3 class="author">  Identification, Kor updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Unifies both the old cloaks and recently added new cloaks into a single set of cloaks.</li>
-				<li class="tweak">Backpacks don't appear over the top of cloaks</li>
-			</ul>
-			<h3 class="author">UselessTheremin updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">kittens now have randomized names</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -30340,3 +30340,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - spellcheck: Fixed a typo with poultice making.
   adamsong:
   - bugfix: fixed bug in dna console sanitization
+2022-03-17:
+  '  Identification':
+  - imageadd: Telescopic batons are now a discernible shape
+  Chubbygummibear:
+  - rscadd: Throwing Mjolnier into someone with anti-magic makes it go bye bye in
+      a big boom
+  ToasterBiome:
+  - bugfix: removes erroneous admin logging that is not needed

html/changelogs/AutoChangelog-pr-13263.yml

@@ -1,4 +0,0 @@
-author: "Chubbygummibear"
-delete-after: true 
-changes: 
-  - rscadd: "Throwing Mjolnier into someone with anti-magic makes it go bye bye in a big boom"

html/changelogs/AutoChangelog-pr-13425.yml

@@ -1,4 +0,0 @@
-author: "ToasterBiome"
-delete-after: true 
-changes: 
-  - bugfix: "removes erroneous admin logging that is not needed"

html/changelogs/AutoChangelog-pr-13430.yml

@@ -1,4 +0,0 @@
-author: "  Identification"
-delete-after: true 
-changes: 
-  - imageadd: "Telescopic batons are now a discernible shape"

html/changelogs/AutoChangelog-pr-13447.yml

@@ -0,0 +1,4 @@
+author: "Sniblet"
+delete-after: true 
+changes: 
+  - tweak: "made the code slightly less illiterate"