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/projectiles/gun.dm

@@ -201,7 +201,7 @@
 
 			in_chamber.on_hit(M)
 			if (in_chamber.damage_type != HALLOSS)
-				user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]")
+				user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
 				user.death()
 			else
 				user << "<span class = 'notice'>Ow...</span>"

code/modules/projectiles/guns/alien.dm

@@ -5,6 +5,7 @@
 	name = "alloy spike"
 	desc = "It's about a foot of weird silver metal with a wicked point."
 	sharp = 1
+	edge = 0
 	throwforce = 5
 	w_class = 2
 	icon = 'icons/obj/weapons.dmi'

code/modules/projectiles/guns/projectile/bow.dm

@@ -9,6 +9,7 @@
 	throwforce = 8
 	w_class = 3.0
 	sharp = 1
+	edge = 0
 
 /obj/item/weapon/arrow/proc/removed() //Helper for metal rods falling apart.
 	return

code/modules/projectiles/guns/projectile/revolver.dm

@@ -183,7 +183,7 @@
 				playsound(user, fire_sound, 50, 1)
 				user.visible_message("<span class='danger'>[user.name] fires [src] at \his head!</span>", "<span class='danger'>You fire [src] at your head!</span>", "You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!")
 				if(!P.nodamage)
-					user.apply_damage(300, BRUTE, affecting) // You are dead, dead, dead.
+					user.apply_damage(300, BRUTE, affecting, sharp=1) // You are dead, dead, dead.
 				return
 	..()
 

code/modules/projectiles/projectile/bullets.dm

@@ -6,6 +6,7 @@
 	nodamage = 0
 	flag = "bullet"
 	embed = 1
+	sharp = 1
 
 	on_hit(var/atom/target, var/blocked = 0)
 		if (..(target, blocked))
@@ -17,6 +18,7 @@
 	stun = 5
 	weaken = 5
 	embed = 0
+	sharp = 0
 
 /obj/item/projectile/bullet/weakbullet/beanbag		//because beanbags are not bullets
 	name = "beanbag"
@@ -47,6 +49,8 @@
 /obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit
 	name = "exploding bullet"
 	damage = 20
+	embed = 0
+	edge = 1
 
 
 /obj/item/projectile/bullet/stunshot
@@ -56,6 +60,7 @@
 	weaken = 10
 	stutter = 10
 	embed = 0
+	sharp = 0
 
 /obj/item/projectile/bullet/a762
 	damage = 25

code/modules/projectiles/projectile/special.dm

@@ -17,7 +17,8 @@
 	icon_state= "bolter"
 	damage = 50
 	flag = "bullet"
-
+	sharp = 1
+	edge = 1
 
 	on_hit(var/atom/target, var/blocked = 0)
 		explosion(target, -1, 0, 2)