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/modules/research/xenoarchaeology/finds/finds_misc.dm

@@ -5,6 +5,9 @@
 	force = 8.0
 	throwforce = 15.0
 	icon_state = "phoronlarge"
+	sharp = 1
+	edge = 1
+
 /obj/item/weapon/shard/phoron/New()
 
 	src.icon_state = pick("phoronlarge", "phoronmedium", "phoronsmall")

code/modules/research/xenoarchaeology/geosample.dm

@@ -20,6 +20,7 @@
 	icon = 'icons/obj/xenoarchaeology.dmi'
 	icon_state = "sliver1"	//0-4
 	w_class = 1
+	sharp = 1
 	//item_state = "electronic"
 	var/source_rock = "/turf/simulated/mineral/"
 	var/datum/geosample/geological_data