conflicts!!!

2020-07-03 15:45:11 +03:00
parent 82c6a02feb 71b98f72aa
commit f0154f3f1c
24 changed files with 129 additions and 81 deletions
@@ -50,6 +50,44 @@
 		-->
 		<div class="commit sansserif">

+			<h2 class="date">03 July 2020</h2>
+			<h3 class="author">Arturlang updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can now toggle hardsuit helmets from the strip menu</li>
+			</ul>
+			<h3 class="author">Ghommie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixed custom speech/tongue stuff.</li>
+				<li class="balance">Lowered shaft miners' paycheck, they have other ways to make cash.</li>
+				<li class="rscadd">You can't (un)equip garments on/from obscured inventory slots anymore.</li>
+				<li class="balance">The stamina cost multiplier for swinging melee weapons against mobs has been brought back to 1 from 0.8</li>
+				<li class="balance">The stamina cost for throwing mobs now scales with their mob size variable.</li>
+			</ul>
+			<h3 class="author">LetterN updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Ported some tags from tgui-3.0 to Vending.js</li>
+				<li class="bugfix">vending icons</li>
+				<li class="bugfix">r&d icons</li>
+				<li class="bugfix">chem master icons</li>
+			</ul>
+			<h3 class="author">Onule updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">titanium wall man good</li>
+			</ul>
+			<h3 class="author">Sonic121x updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Bringback the ChemMaster pill type button.</li>
+				<li class="bugfix">Fix Technode icon.</li>
+			</ul>
+			<h3 class="author">bunny232 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Witchhunter hat no longer obscures mask ears ,eyes, face and mouth</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">bloodpacks initialise correctly now</li>
+			</ul>
+
 			<h2 class="date">02 July 2020</h2>
 			<h3 class="author">Ghommie updated:</h3>
 			<ul class="changes bgimages16">
@@ -26208,3 +26208,27 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
      How lazy!
  silicons:
  - bugfix: bohbombing is a thing now
+2020-07-03:
+  Arturlang:
+  - rscadd: You can now toggle hardsuit helmets from the strip menu
+  Ghommie:
+  - bugfix: fixed custom speech/tongue stuff.
+  - balance: Lowered shaft miners' paycheck, they have other ways to make cash.
+  - rscadd: You can't (un)equip garments on/from obscured inventory slots anymore.
+  - balance: The stamina cost multiplier for swinging melee weapons against mobs has
+      been brought back to 1 from 0.8
+  - balance: The stamina cost for throwing mobs now scales with their mob size variable.
+  LetterN:
+  - tweak: Ported some tags from tgui-3.0 to Vending.js
+  - bugfix: vending icons
+  - bugfix: r&d icons
+  - bugfix: chem master icons
+  Onule:
+  - tweak: titanium wall man good
+  Sonic121x:
+  - bugfix: Bringback the ChemMaster pill type button.
+  - bugfix: Fix Technode icon.
+  bunny232:
+  - tweak: Witchhunter hat no longer obscures mask ears ,eyes, face and mouth
+  timothyteakettle:
+  - bugfix: bloodpacks initialise correctly now
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes: 
-  - rscadd: "You can't (un)equip garments on/from obscured inventory slots anymore."
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes: 
-  - balance: "Lowered shaft miners' paycheck, they have other ways to make cash."
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes: 
-  - balance: "The stamina cost multiplier for swinging melee weapons against mobs has been brought back to 1 from 0.8"
-  - balance: "The stamina cost for throwing mobs now scales with their mob size variable."
@@ -1,4 +0,0 @@
-author: "bunny232"
-delete-after: True
-changes: 
-  - tweak: "Witchhunter hat no longer obscures mask ears ,eyes, face and mouth"
@@ -1,7 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes: 
-  - tweak: "Ported some tags from tgui-3.0 to Vending.js"
-  - bugfix: "vending icons"
-  - bugfix: "r&d icons"
-  - bugfix: "chem master icons"
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - bugfix: "bloodpacks initialise correctly now"
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - refactor: "blood_DNA[\"color\"] is now a single variable instead of a list"