Merge branch 'master' into dev

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

code/game/gamemodes/blob/blobs/factory.dm

@@ -57,7 +57,7 @@
 			factory.spores += src
 		..(loc)
 		return
-	Die()
+	death()
 		..()
 		if(factory)
 			factory.spores -= src

code/game/gamemodes/changeling/changeling_powers.dm

@@ -169,7 +169,7 @@
 				src.visible_message("<span class='danger'>[src] stabs [T] with the proboscis!</span>")
 				T << "<span class='danger'>You feel a sharp stabbing pain!</span>"
 				var/datum/organ/external/affecting = T.get_organ(src.zone_sel.selecting)
-				if(affecting.take_damage(39,0,1,"large organic needle"))
+				if(affecting.take_damage(39,0,1,0,"large organic needle"))
 					T:UpdateDamageIcon()
 					continue