Merge pull request #10025 from Linzolle/butchering

refactor butchering component
This commit is contained in:
kevinz000
2019-12-05 21:19:57 -07:00
committed by GitHub
8 changed files with 66 additions and 39 deletions
+5 -3
View File
@@ -174,11 +174,15 @@
*/
/obj/item/pen/edagger
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off
sharpness = IS_SHARP
var/on = FALSE
/obj/item/pen/edagger/Initialize()
. = ..()
AddComponent(/datum/component/butchering, 60, 100, 0, 'sound/weapons/blade1.ogg', TRUE)
AddComponent(/datum/component/butchering, 60, 100, 0, 'sound/weapons/blade1.ogg')
/obj/item/pen/edagger/get_sharpness()
return on * sharpness
/obj/item/pen/edagger/attack_self(mob/living/user)
if(on)
@@ -201,8 +205,6 @@
throwforce = 35
playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
to_chat(user, "<span class='warning'>[src] is now active.</span>")
var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering)
butchering.butchering_enabled = on
update_icon()
/obj/item/pen/edagger/update_icon()