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

Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

html/changelog.html

@@ -56,6 +56,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">31 July 2015</h2>
+			<h3 class="author">HarpyEagle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed projectiles being able to hit people in body parts that they don't have. This will also mean that the less limbs someone has the less effective they will be as a body shield.</li>
+			</ul>
+
 			<h2 class="date">29 July 2015</h2>
 			<h3 class="author">Karolis2011 updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -2095,3 +2095,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Made tagger and sorting pipes dispensible.
   - bugfix: Unwelding and welding sorting/tagger pipes, no longer delete data about
       them.
+2015-07-31:
+  HarpyEagle:
+  - bugfix: Fixed projectiles being able to hit people in body parts that they don't
+      have. This will also mean that the less limbs someone has the less effective
+      they will be as a body shield.

html/changelogs/HarpyEagle-dev-freeze.yml

@@ -1,4 +1,3 @@
 author: HarpyEagle
+changes: []
 delete-after: false
-changes:
-  - bugfix: "Fixed projectiles being able to hit people in body parts that they don't have. This will also mean that the less limbs someone has the less effective they will be as a body shield."