Merge pull request #5705 from Citadel-Station-13/upstream-merge-35744

[MIRROR] Refactors butchering to a component - item-based butchering effectiveness, speed, and chances
This commit is contained in:
deathride58
2018-02-25 21:41:38 +00:00
committed by GitHub
29 changed files with 207 additions and 30 deletions
@@ -166,6 +166,7 @@
loc.visible_message("<span class='warning'>A grotesque blade forms around [loc.name]\'s arm!</span>", "<span class='warning'>Our arm twists and mutates, transforming it into a deadly blade.</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
if(synthetic)
can_drop = TRUE
AddComponent(/datum/component/butchering, 60, 80)
/obj/item/melee/arm_blade/afterattack(atom/target, mob/user, proximity)
if(!proximity)
@@ -45,6 +45,9 @@
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended")
/obj/item/melee/cultblade/Initialize()
. = ..()
AddComponent(/datum/component/butchering, 40, 100)
/obj/item/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user)
if(!iscultist(user))
@@ -112,6 +115,7 @@
set_light(4)
jaunt = new(src)
linked_action = new(src)
AddComponent(/datum/component/butchering, 50, 80)
/obj/item/twohanded/required/cult_bastard/examine(mob/user)
if(contents.len)
@@ -662,6 +666,10 @@
hitsound = 'sound/weapons/bladeslice.ogg'
var/datum/action/innate/cult/spear/spear_act
/obj/item/twohanded/cult_spear/Initialize()
. = ..()
AddComponent(/datum/component/butchering, 100, 90)
/obj/item/twohanded/cult_spear/Destroy()
if(spear_act)
qdel(spear_act)