Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

2020-07-14 16:15:48 +03:00
parent c964cadd85 55c4e40fbb
commit d0f1a805e4
19 changed files with 100 additions and 57 deletions
@@ -50,6 +50,17 @@
 		-->
 		<div class="commit sansserif">

+			<h2 class="date">13 July 2020</h2>
+			<h3 class="author">Linzolle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">you can no longer vore and digest people regardless of vore preferences</li>
+			</ul>
+			<h3 class="author">Owai-Seek updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Trashbags can now hold most shoes, and organs.</li>
+				<li class="balance">You can no longer nest nuke disks or hold brains in the trash.</li>
+			</ul>
+
 			<h2 class="date">12 July 2020</h2>
 			<h3 class="author">DeltaFire15 updated:</h3>
 			<ul class="changes bgimages16">
@@ -26344,3 +26344,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
      people.
  zeroisthebiggay:
  - bugfix: a singular stray pixel
+2020-07-13:
+  Linzolle:
+  - bugfix: you can no longer vore and digest people regardless of vore preferences
+  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.
@@ -1,5 +0,0 @@
-author: "Owai-Seek"
-delete-after: True
-changes: 
-  - tweak: "Trashbags can now hold most shoes, and organs."
-  - balance: "You can no longer nest nuke disks or hold brains in the trash."
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - bugfix: "circuit reagent heaters are now sanitized for temperature from 2.7 to 1000."
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - rscadd: "chemical reactions now are sorted by priority first and temperature second."