Merge pull request #228 from BlueNexus/A-Release

Release patches
sshado · Oct 2, 2015 · fdf89d9 · fdf89d9
2 parents 4f9bc42 + d9e7a15
commit fdf89d9
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 4 deletions.
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -275,7 +275,7 @@
 
 	has_organ = list() //TODO: Positronic brain.
 
-	
+
 /datum/species/machine/equip_survival_gear(var/mob/living/carbon/human/H)
 
 /datum/species/machine/handle_death(var/mob/living/carbon/human/H)
@@ -294,10 +294,10 @@
 	language = "Chittin"
 	unarmed_types = list(/datum/unarmed_attack/claws)
 	brute_mod = 0.7
-	burn_mod = 1.6
+	burn_mod = 1.3
 	darksight = 8
-	
+
 	flags = CAN_JOIN | IS_WHITELISTED | HAS_UNDERWEAR | HAS_LIPS | HAS_SKIN_COLOR
-	
+
 	blood_color = "#328332"
 	flesh_color = "#8C4600"
diff --git a/html/changelog.html b/html/changelog.html
@@ -56,6 +56,53 @@
 		
 		-->
 
+			<div class="commit sansserif">
+			<h2 class="date">2 October 2015</h2>
+			<h3 class="author">Walmartcheapo updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Ported an unfinished version of the kidan from UT.</li>
+				<li class="rscadd">If you wish to play one, read this - http://nanotrasen.se/wiki/index.php/Kidan</li>
+				<li class="rscadd">Ported EAL from UT.</li>
+			</ul>
+
+			<div class="commit sansserif">
+			<h2 class="date">2 October 2015</h2>
+			<h3 class="author">Colafiend updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added new clothing vending machines.</li>
+				<li class="rscadd">Gold slimes now give materials instead of fizzling</li>
+				<li class="rscadd">You can now put hats on dogs.</li>
+				<li class="rscadd">Added six new cans to vending machines.</li>
+			</ul>
+
+			<div class="commit sansserif">
+			<h2 class="date">2 October 2015</h2>
+			<h3 class="author">Isra updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added prescription mesons to engineering storage.</li>
+				<li class="rscadd">Several small additions</li>
+				<li class="bugfix">Chefs can now properly access hydroponics.</li>
+				<li class="bugfix">The missing wire at the engine solars has been fixed.</li>
+			</ul>
+
+			<div class="commit sansserif">
+			<h2 class="date">2 October 2015</h2>
+			<h3 class="author">Lykayos updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added two new implants - Enslavement(working) and amnesia</li>
+				<li class="rscadd">Added Cryogenics-class coolers</li>
+			</ul>
+
+			<div class="commit sansserif">
+			<h2 class="date">2 October 2015</h2>
+			<h3 class="author">Cirra updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Construction drones now start with a sheet loader</li>
+				<li class="rscadd">New Centcomm uniform sets</li>
+				<li class="bugfix">Overlay clearing now actually works.</li>
+				<li class="bugfix">Canisters now rupture when destroyed, releasing their gas.</li>
+			</ul>
+
 			<div class="commit sansserif">
 			<h2 class="date">27 September 2015</h2>
 			<h3 class="author">Wk_Savage updated:</h3>