fixes marks

- marks are no longer set by the blade and detonated by the hand, outside of flesh
- fixed it so sickles can no longer be used by nonheretics, again, needs testing for heretic minions (ghouls)
This commit is contained in:
kiwedespars
2021-03-13 19:04:09 -08:00
parent 10a6b9ba9e
commit 96c2cf2676
3 changed files with 14 additions and 7 deletions
@@ -95,12 +95,17 @@
. = ..()
linked_action = new(src)
/obj/item/melee/sickly_blade/attack(mob/living/M, mob/living/user)
if(!(IS_HERETIC(user) || !IS_HERETIC_MONSTER(user)))
/obj/item/melee/sickly_blade/attack(mob/living/target, mob/living/user)
if(!(IS_HERETIC(user) || IS_HERETIC_MONSTER(user)))
to_chat(user,"<span class='danger'>You feel a pulse of alien intellect lash out at your mind!</span>")
var/mob/living/carbon/human/human_user = user
human_user.AdjustParalyzed(5 SECONDS)
return FALSE
user.DefaultCombatKnockdown(100)
user.dropItemToGround(src, TRUE)
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.apply_damage(rand(force/2, force), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
else
user.adjustBruteLoss(rand(force/2,force))
return
return ..()
/obj/item/melee/sickly_blade/pickup(mob/user)
@@ -141,9 +141,10 @@
banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/void_mark)
route = PATH_FLESH
/datum/eldritch_knowledge/flesh_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters)
/datum/eldritch_knowledge/flesh_mark/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
if(isliving(target))
. = TRUE
var/mob/living/living_target = target
living_target.apply_status_effect(/datum/status_effect/eldritch/flesh)
@@ -87,9 +87,10 @@
banned_knowledge = list(/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/flesh_mark,/datum/eldritch_knowledge/void_mark)
route = PATH_RUST
/datum/eldritch_knowledge/rust_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters)
/datum/eldritch_knowledge/rust_mark/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
if(isliving(target))
. = TRUE
var/mob/living/living_target = target
living_target.apply_status_effect(/datum/status_effect/eldritch/rust)