Merge resolution.

This commit is contained in:
Zuhayr
2013-12-01 15:19:29 +10:30
28 changed files with 1053 additions and 782 deletions
+21 -1
View File
@@ -73,7 +73,27 @@ should be listed in the changelog upon commit though. Thanks. -->
<div class='commit sansserif'>
<div class='commit sansserif'>
<h2 class='date'>24 November 2013</h2>
<h3 class='author'>Yinadele updated:</h3>
<ul class='changes bgimages16'>
<li class='rscadd'></li>
<li class='experiment'>Supermatter engine added! Please treat your new engine gently, and report any strangeness!</li>
<li class='tweak'>Rebalanced events so people don't explode into appendicitis or have their organs constantly explode.</li>
<li class='rscadd'>Vending machines have had bottled water, iced tea, and grape soda added.</li>
<li class='rscadd'>Head reattachment surgery added! Sew heads back on proper rather than monkey madness.</li>
<li class='rscadd'>Pain crit rebalanced - Added aim variance depending on pain levels, nerfed blackscreen severely.</li>
<li class='rscadd'>Cyborg alt titles: Robot, and Android added! These will make you spawn as a posibrained robot. Please enjoy!</li>
<li class='bugfix'>Fixed the sprite on the modified welding goggles, added a pair to the CE's office where they'll be used.</li>
<li class='bugfix'>Fixed atmos computers- They are once again responsive!</li>
<li class='tweak'>Added in functionality proper for explosive implants- You can now set their level of detonation, and their effects are more responsively concrete depending on setting.</li>
<li class='rscadd'>Hemostats re-added to autolathe!</li>
<li class='rscadd'>Added two manuals on atmosia and EVA, by MagmaRam! Found in engineering and the engineering bookcase.</li>
<li class='bugfix'>Fixed areas in medbay to have fully functional APC sectors.</li>
<li class='rscadd'>Girders are now lasable.</li>
<li class='experiment'>Please wait warmly, new features planned for next merge!</li>
</ul>
</div>
<h2 class='date'>29 October 2013</h2>
<h3 class='author'>Cael_Aislinn updated:</h3>
<ul class='changes bgimages16'>