Merge remote-tracking branch 'upstream/master'

code/game/machinery/computer/dna_console.dm

@@ -474,6 +474,8 @@
 			var/sequence = GET_GENE_STRING(path, scanner_occupant.dna)
 
 			var/newgene = params["gene"]
+			if(length(newgene) > 1) // Oh come on
+				return // fuck off
 			var/genepos = text2num(params["pos"])
 
 			// If the new gene is J, this means we're dealing with a JOKER

code/game/objects/items/manuals.dm

@@ -185,8 +185,9 @@
 
 				<h2>Poultice:</h2>
 
-				To prepare, first gather mushroom stems, cacti or porcini leaves, ashes from a burnt item, and a heat source such as a welder.
-				Next, mash together 4 mushroom stems and either 3 cacti fruit.
+				To prepare, first gather mushroom stems, cacti or porcini leaves, ashes from a burnt item, and a heat source such as a welder/lit candle.
+				Next, mash together 4 mushroom stems and 3 cacti fruit.
+				Porcini can be used instead of cacti fruit, but due to having less concentration it may be harder to fit enough leaves required to make the product.
 				Afterwards, scoop up ashes with the mortar. If the ashes are warm enough, it may mix without extra heat needed.
 				If it has yet to mix, heat up the bowl by using the welder on it until it has done so.
 				Apply product to wounded parts to heal them. May cause loss of breath.
@@ -201,7 +202,7 @@
 
 				<h2>Capmix:</h2>
 
-				To prepare, first gather a mushroom cap, ashes from a burnt item, and a heat source such as a welder.
+				To prepare, first gather a mushroom cap, ashes from a burnt item, and a heat source such as a welder/lit candle.
 				Next, mash together one mushroom cap.
 				Afterwards, scoop up ashes with the mortar. If the ashes are warm enough, it may mix without extra heat needed.
 				If it has yet to mix, heat up the bowl by using the welder on it until it has done so.
@@ -217,7 +218,7 @@
 				Ingesting capmix in order to expel the resin.
 
 				Resin is also useful for ensuring things stick together, and is a stronger binder than watcher sinew.
-				To use it for this purpose you'll have to solidify it by heating it up.
+				To use it for this purpose you'll have to solidify it by adding water.
 
 				<h2>Mushroom Paste:</h2>
 

html/changelog.html

@@ -37,7 +37,7 @@
 		<td valign='top'>
 			<font size='2'><b>Current Head Developers:</b> JamieD12, Theos<br></font>
 			<font size='2'><b>Currently Active GitHub contributor list:</b> <a href='https://github.com/yogstation13/Yogstation/graphs/contributors'>-Click Here-</a><br></font>
-			<font size='2'><b>Maintainers:</b> AshCorr, Identification, Monster860, Partheo, Asd, TheGamerdk, adamsogm<br></font>
+			<font size='2'><b>Maintainers:</b> AshCorr, Identification, Monster860, Partheo, Asd, TheGamerdk, adamsogm, baiomu<br></font>
 			<font size='2'><b>Spriters:</b> Identification, Keekenox, Kmc2000, Meeeeep7, Missatessatessy, Toriate, Partheo, r3d<br></font>
 			<font size='2'><b>Mappers:</b> DotLyna, MayhemSailor, Monster860, Ktlwjec, Wejengin2<br></font>
 			<font size='2'><b>Sounds:</b> Lasty/Vinyl, Skie, Swissloaf<br></font>
@@ -58,6 +58,23 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">16 March 2022</h2>
+			<h3 class="author">Marmio64 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds text saying that you can use a lit candle instead of a welder to heat up bowls, substitute cacti for porcini leaves, and that resin uses water now instead of heat to solidify, to the ash walker's knowledge book.</li>
+				<li class="spellcheck">Fixed a typo with poultice making.</li>
+			</ul>
+			<h3 class="author">adamsong updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixed bug in dna console sanitization</li>
+			</ul>
+
+			<h2 class="date">15 March 2022</h2>
+			<h3 class="author">ToasterBiome updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">baiomu is now credited under maintainer</li>
+			</ul>
+
 			<h2 class="date">14 March 2022</h2>
 			<h3 class="author">nmajask updated:</h3>
 			<ul class="changes bgimages16">
@@ -1220,25 +1237,6 @@
 			<ul class="changes bgimages16">
 				<li class="rscadd">kittens now have randomized names</li>
 			</ul>
-
-			<h2 class="date">15 December 2021</h2>
-			<h3 class="author">adamsong updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed AO OOC not working</li>
-				<li class="rscadd">Added pretty filter to *me and several other things</li>
-			</ul>
-
-			<h2 class="date">14 December 2021</h2>
-			<h3 class="author">adamsong updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed borgs being unable to use the advanced analyzer as a surgical processor</li>
-				<li class="bugfix">fixed quirk exploit that allowed for more positive quirks than there were points for</li>
-				<li class="bugfix">fixed buffoonery in the advanced surgical kit tech node</li>
-			</ul>
-			<h3 class="author">nmajask updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed some skirts having no icons when worn by someone with digitigrade legs</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -30329,3 +30329,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   nmajask:
   - tweak: pacifists who order stechkins from uplinks now get a version loaded with
       soporific rounds
+2022-03-15:
+  ToasterBiome:
+  - rscadd: baiomu is now credited under maintainer
+2022-03-16:
+  Marmio64:
+  - rscadd: Adds text saying that you can use a lit candle instead of a welder to
+      heat up bowls, substitute cacti for porcini leaves, and that resin uses water
+      now instead of heat to solidify, to the ash walker's knowledge book.
+  - spellcheck: Fixed a typo with poultice making.
+  adamsong:
+  - bugfix: fixed bug in dna console sanitization

html/changelogs/AutoChangelog-pr-13430.yml

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

html/templates/header.html

@@ -37,7 +37,7 @@
 		<td valign='top'>
 			<font size='2'><b>Current Head Developers:</b> JamieD12, Theos<br></font>
 			<font size='2'><b>Currently Active GitHub contributor list:</b> <a href='https://github.com/yogstation13/Yogstation/graphs/contributors'>-Click Here-</a><br></font>
-			<font size='2'><b>Maintainers:</b> AshCorr, Identification, Monster860, Partheo, Asd, TheGamerdk, adamsogm<br></font>
+			<font size='2'><b>Maintainers:</b> AshCorr, Identification, Monster860, Partheo, Asd, TheGamerdk, adamsogm, baiomu<br></font>
 			<font size='2'><b>Spriters:</b> Identification, Keekenox, Kmc2000, Meeeeep7, Missatessatessy, Toriate, Partheo, r3d<br></font>
 			<font size='2'><b>Mappers:</b> DotLyna, MayhemSailor, Monster860, Ktlwjec, Wejengin2<br></font>
 			<font size='2'><b>Sounds:</b> Lasty/Vinyl, Skie, Swissloaf<br></font>