Fixes missing cooldowns, missing cult blade sound.

Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
This commit is contained in:
mwerezak
2016-04-22 04:58:25 -04:00
committed by HarpyEagle
parent deb215d262
commit 4951790b50
21 changed files with 53 additions and 49 deletions
@@ -101,13 +101,6 @@
return
return ..()
/obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
if ((CLUMSY in user.mutations) && prob(50))
user << "<span class='warning'>You somehow managed to cut yourself with \the [src].</span>"
user.take_organ_damage(20)
return
return ..()
/obj/item/weapon/material/kitchen/utensil/knife/plastic
default_material = "plastic"