Separates the sharp flag into edge and sharp

Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
This commit is contained in:
mwerezak
2014-06-17 06:51:51 -04:00
committed by ZomgPonies
parent cfb05dd741
commit 4a2993b20b
39 changed files with 105 additions and 81 deletions
+1 -1
View File
@@ -110,7 +110,7 @@
attackby(obj/item/weapon/W as obj, mob/user as mob)
if(!istype(W)) return
if (is_sharp(W))
if (can_puncture(W))
visible_message("\red <b>[user] pierces [src] with [W]!</b>")
deflate(1)
if(W.damtype == BRUTE || W.damtype == BURN)