Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2014-05-03 16:56:19 +01:00
75 changed files with 1663 additions and 1678 deletions
+29
View File
@@ -56,6 +56,27 @@ should be listed in the changelog upon commit though. Thanks. -->
<!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
<div class='commit sansserif'>
<h2 class='date'>25 April 2014</h2>
<h3 class='author'>Various updated:</h3>
<ul class='changes bgimages16'>
<li class='rscadd'>Overhauled saycode, you can now use languages over the radio.</li>
<li class='rscadd'>Chamelon items beyond just the suit.</li>
<li class='rscadd'>NanoUI Virology</li>
<li class='rscadd'>3D Sounds</li>
<li class='rscadd'>AI Channel color for when they want to be all sneaky</li>
<li class='rscadd'>New inflatable walls and airlocks for your breach sealing pleasure.</li>
<li class='rscadd'>Carbon Copy papers, so you can subject everyone to your authority and paperwork, but mainly paperwork</li>
<li class='rscadd'>Undershirts and rolling down jumpsuits</li>
<li class='rscadd'>Insta-hit tasers, can be shot through glass as well.</li>
<li class='rscadd'>Changeling balances, an emphasis put more on stealth.</li>
<li class='rscdel'>Genetics disabled</li>
<li class='rscdel'>Telescience removed, might be added again when we come up with a less math headache enducing version of it.</li>
<li class='bugfix'>Bugfixes galore!</li>
</ul>
</div>
<div class='commit sansserif'>
<h2 class='date'>11 April 2014</h2>
<h3 class='author'>Jarcolr updated:</h3>
@@ -76,6 +97,14 @@ should be listed in the changelog upon commit though. Thanks. -->
</ul>
</div>
<div class='commit sansserif'>
<h2 class='date'>30 March 2014</h2>
<h3 class='author'>RavingManiac updated:</h3>
<ul class='changes bgimages16'>
<li class='rscadd'>Inflatable walls and doors added. Useful for sealing off hull breaches, but easily punctured by sharp objects and Tajarans.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">10 March 2014</h2>
<h3 class="author">Chinsky updated:</h3>