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

2020-07-09 22:14:20 +03:00
parent e12d690d3f 0c7b06baf4
commit 9de8483bcf
31 changed files with 1145 additions and 846 deletions
@@ -50,6 +50,36 @@
 		-->
 		<div class="commit sansserif">

+			<h2 class="date">09 July 2020</h2>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">bluespace tray added, allowing twice as many items as the regular tray, printable at the service lathe, researched through science</li>
+				<li class="rscadd">bluespace jar added, a kind of pet carrier that allows human sized mobs inside, and smashes when thrown, researched and printed through science</li>
+			</ul>
+
+			<h2 class="date">08 July 2020</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The kill-once objective now works properly.</li>
+			</ul>
+			<h3 class="author">EmeraldSundisk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">CogStation now has an apothecary</li>
+				<li class="rscdel">Removes an outdated note on sleepers</li>
+				<li class="tweak">Readjusts CogStation's chemistry lab</li>
+				<li class="tweak">Slight area designation adjustments for Robotics</li>
+				<li class="bugfix">The arrivals plaque should be readable now</li>
+			</ul>
+			<h3 class="author">Owai-Seek updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Margarine, Chili Cheese Fries.</li>
+				<li class="tweak">Egg Wraps are now categorized under egg foods.</li>
+				<li class="bugfix">Tuna Sandwich crafting/sprite is now visible.</li>
+				<li class="imageadd">Icons for chicken, cooked chicken, steak, grilled carp, corndogs</li>
+				<li class="imageadd">Icons for chili cheese fries, margarine, BLT sandwich</li>
+				<li class="imageadd">(Unused) icons for raw meatballs, and lard</li>
+			</ul>
+
 			<h2 class="date">07 July 2020</h2>
 			<h3 class="author">KasparoVy updated:</h3>
 			<ul class="changes bgimages16">
@@ -26274,3 +26274,25 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
      use custom sprite sizes so just ignore these changes.
  - bugfix: Fixed the "Move it to the threshold" button; it now does what it says.
  - tweak: Reworded some text to be clearer.
+2020-07-08:
+  DeltaFire15:
+  - bugfix: The kill-once objective now works properly.
+  EmeraldSundisk:
+  - rscadd: CogStation now has an apothecary
+  - rscdel: Removes an outdated note on sleepers
+  - tweak: Readjusts CogStation's chemistry lab
+  - tweak: Slight area designation adjustments for Robotics
+  - bugfix: The arrivals plaque should be readable now
+  Owai-Seek:
+  - rscadd: Margarine, Chili Cheese Fries.
+  - tweak: Egg Wraps are now categorized under egg foods.
+  - bugfix: Tuna Sandwich crafting/sprite is now visible.
+  - imageadd: Icons for chicken, cooked chicken, steak, grilled carp, corndogs
+  - imageadd: Icons for chili cheese fries, margarine, BLT sandwich
+  - imageadd: (Unused) icons for raw meatballs, and lard
+2020-07-09:
+  timothyteakettle:
+  - rscadd: bluespace tray added, allowing twice as many items as the regular tray,
+      printable at the service lathe, researched through science
+  - rscadd: bluespace jar added, a kind of pet carrier that allows human sized mobs
+      inside, and smashes when thrown, researched and printed through science
@@ -1,9 +0,0 @@
-author: "Owai-Seek"
-delete-after: True
-changes: 
-  - rscadd: "Margarine, Chili Cheese Fries."
-  - tweak: "Egg Wraps are now categorized under egg foods."
-  - bugfix: "Tuna Sandwich crafting/sprite is now visible."
-  - imageadd: "Icons for chicken, cooked chicken, steak, grilled carp, corndogs"
-  - imageadd: "Icons for chili cheese fries, margarine, BLT sandwich"
-  - imageadd: "(Unused) icons for raw meatballs, and lard"
@@ -1,8 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes: 
-  - rscadd: "CogStation now has an apothecary"
-  - rscdel: "Removes an outdated note on sleepers"
-  - tweak: "Readjusts CogStation's chemistry lab"
-  - tweak: "Slight area designation adjustments for Robotics"
-  - bugfix: "The arrivals plaque should be readable now"
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes: 
-  - bugfix: "The kill-once objective now works properly."
@@ -0,0 +1,5 @@
+author: "Chiirno"
+delete-after: True
+changes: 
+  - code_imp: "Gave jellypeople a unique brain object /obj/item/organ/brain/jelly"
+  - imageadd: "added an icon for jellypeople brains."
@@ -0,0 +1,5 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes: 
+  - rscadd: "Adds a pool to PubbyStation"
+  - tweak: "Slight adjustments to the surrounding area as to fit said pool"
@@ -0,0 +1,4 @@
+author: "Sneakyrat6"
+delete-after: True
+changes: 
+  - bugfix: "Fixes hair falling out of hoodies."
@@ -0,0 +1,4 @@
+author: "TheObserver-sys"
+delete-after: True
+changes: 
+  - bugfix: "Actually adds the juice reagent to make laugh peas donuts."