Merge branch 'master' of https://github.com/SandPoot/Sandstorm-Station-13

html/changelog.html

@@ -50,6 +50,28 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">19 June 2020</h2>
+			<h3 class="author">Bhijn updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Atmos can no longer become completely bricked</li>
+			</ul>
+			<h3 class="author">Funce updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Square root circuit should now actually work.</li>
+			</ul>
+			<h3 class="author">TheSpaghetti updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">more insectoid insects</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds the brain trauma event, where one player gets a random brain trauma!</li>
+				<li class="rscadd">Adds the wisdom cow event, where the wisdom cow appears on the station!</li>
+				<li class="rscadd">Adds the fake virus event, where people get fake virus symptoms.</li>
+				<li class="rscadd">Adds the stray cargo pod event, where a cargo pod crashes into the station.</li>
+				<li class="rscadd">Adds the fugitives event, where fugitives are loose on the station, and it's the hunters jobs to capture them.</li>
+			</ul>
+
 			<h2 class="date">18 June 2020</h2>
 			<h3 class="author">Detective-Google updated:</h3>
 			<ul class="changes bgimages16">
@@ -63,9 +85,6 @@
 			</ul>
 			<h3 class="author">timothyteakettle updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscadd">medbots can now be tipped over</li>
-				<li class="soundadd">added more medbot sounds</li>
-				<li class="rscadd">embeds got reworked, sticky tape was added, more bullets that ricochet also added</li>
 				<li class="rscadd">embeds got reworked, sticky tape was added, more bullets that ricochet also added</li>
 				<li class="rscadd">medbots can now be tipped over</li>
 				<li class="soundadd">added more medbot sounds</li>

html/changelogs/.all_changelog.yml

@@ -25996,3 +25996,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       also added
   - rscadd: medbots can now be tipped over
   - soundadd: added more medbot sounds
+2020-06-19:
+  Bhijn:
+  - bugfix: Atmos can no longer become completely bricked
+  Funce:
+  - bugfix: Square root circuit should now actually work.
+  TheSpaghetti:
+  - rscadd: more insectoid insects
+  timothyteakettle:
+  - rscadd: Adds the brain trauma event, where one player gets a random brain trauma!
+  - rscadd: Adds the wisdom cow event, where the wisdom cow appears on the station!
+  - rscadd: Adds the fake virus event, where people get fake virus symptoms.
+  - rscadd: Adds the stray cargo pod event, where a cargo pod crashes into the station.
+  - rscadd: Adds the fugitives event, where fugitives are loose on the station, and
+      it's the hunters jobs to capture them.

html/changelogs/AutoChangeLog-pr-12482.yml

@@ -1,4 +0,0 @@
-author: "TheSpaghetti"
-delete-after: True
-changes: 
-  - rscadd: "more insectoid insects"

html/changelogs/AutoChangeLog-pr-12548.yml

@@ -1,8 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - rscadd: "Adds the brain trauma event, where one player gets a random brain trauma!"
-  - rscadd: "Adds the wisdom cow event, where the wisdom cow appears on the station!"
-  - rscadd: "Adds the fake virus event, where people get fake virus symptoms."
-  - rscadd: "Adds the stray cargo pod event, where a cargo pod crashes into the station."
-  - rscadd: "Adds the fugitives event, where fugitives are loose on the station, and it's the hunters jobs to capture them."

html/changelogs/AutoChangeLog-pr-12554.yml

@@ -1,4 +0,0 @@
-author: "Bhijn"
-delete-after: True
-changes: 
-  - bugfix: "Atmos can no longer become completely bricked"

html/changelogs/AutoChangeLog-pr-12555.yml

@@ -1,4 +0,0 @@
-author: "Funce"
-delete-after: True
-changes: 
-  - bugfix: "Square root circuit should now actually work."