Merge branch 'vore' of https://github.com/SandPoot/Citadel-Station-13 into vore

html/changelog.html

@@ -590,6 +590,13 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">vegas style bunny ears</li>
 			</ul>
+
+			<h2 class="date">12 May 2021</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">find_safe_turf no longer always fails on safe oxygen levels(??)</li>
+				<li class="bugfix">Heretic bladeshatters now actually take the heretic's z into account as intended, instead of always being station z tweak: Message for failing the bladeshatter despite succeeding the do_after tweak: Improves bladeshatter a bit by making it safer codewise</li>
+			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>