Merge branch 'master' into TGUI-3.0

html/changelog.html

@@ -50,6 +50,18 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">14 July 2020</h2>
+			<h3 class="author">silicons updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">chemical reactions now are sorted by priority first and temperature second.</li>
+				<li class="rscadd">sec and medical records have been added to character setup.</li>
+				<li class="bugfix">circuit reagent heaters are now sanitized for temperature from 2.7 to 1000.</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">ports a money bag exploit</li>
+			</ul>
+
 			<h2 class="date">13 July 2020</h2>
 			<h3 class="author">Linzolle updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -26350,3 +26350,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Owai-Seek:
   - tweak: Trashbags can now hold most shoes, and organs.
   - balance: You can no longer nest nuke disks or hold brains in the trash.
+2020-07-14:
+  silicons:
+  - rscadd: chemical reactions now are sorted by priority first and temperature second.
+  - rscadd: sec and medical records have been added to character setup.
+  - bugfix: circuit reagent heaters are now sanitized for temperature from 2.7 to
+      1000.
+  timothyteakettle:
+  - bugfix: ports a money bag exploit

html/changelogs/AutoChangeLog-pr-12737.yml

@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - bugfix: "circuit reagent heaters are now sanitized for temperature from 2.7 to 1000."

html/changelogs/AutoChangeLog-pr-12746.yml

@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - rscadd: "chemical reactions now are sorted by priority first and temperature second."