- fixes things.
- user check readded (whoops)
- knwoledge added
- nerfs madness mask
This commit is contained in:
kiwedespars
2021-03-09 12:12:44 -08:00
parent 3ce6459aef
commit 0d696de7cd
4 changed files with 5 additions and 6 deletions
@@ -28,8 +28,8 @@
/obj/effect/eldritch/attackby(obj/item/I, mob/living/user) /obj/effect/eldritch/attackby(obj/item/I, mob/living/user)
. = ..() . = ..()
if(istype(I,/obj/item/nullrod)) if(istype(I, /obj/item/storage/book/bible) || istype(I, /obj/item/nullrod))
user.say("BEGONE FOUL MAGIKS!!", forced = "nullrod") user.say("BEGONE FOUL MAGICKS!!", forced = "bible")
to_chat(user, "<span class='danger'>You disrupt the magic of [src] with [I].</span>") to_chat(user, "<span class='danger'>You disrupt the magic of [src] with [I].</span>")
qdel(src) qdel(src)
@@ -212,7 +212,6 @@
allowed = list(/obj/item/melee/sickly_blade, /obj/item/forbidden_book, /obj/item/living_heart) allowed = list(/obj/item/melee/sickly_blade, /obj/item/forbidden_book, /obj/item/living_heart)
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/void hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/void
flags_inv = NONE flags_inv = NONE
item_flags = EXAMINE_SKIP
// slightly worse than normal cult robes // slightly worse than normal cult robes
armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/void_cloak pocket_storage_component_path = /datum/component/storage/concrete/pockets/void_cloak
@@ -281,7 +280,7 @@
if(DT_PROB(30,delta_time)) if(DT_PROB(30,delta_time))
human_in_range.emote(pick("giggle","laugh")) human_in_range.emote(pick("giggle","laugh"))
human_in_range.adjustStaminaLoss(8) human_in_range.adjustStaminaLoss(6)
if(DT_PROB(25,delta_time)) if(DT_PROB(25,delta_time))
human_in_range.Dizzy(5) human_in_range.Dizzy(5)
@@ -1,6 +1,6 @@
/** /**
* #Eldritch Knwoledge * #Eldritch Knowledge
* *
* Datum that makes eldritch cultist interesting. * Datum that makes eldritch cultist interesting.
* *
@@ -50,7 +50,7 @@
/obj/item/melee/touch_attack/mansus_fist/afterattack(atom/target, mob/user, proximity_flag, click_parameters) /obj/item/melee/touch_attack/mansus_fist/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(!proximity_flag) if(!proximity_flag | target == user)
return return
playsound(user, 'sound/items/welder.ogg', 75, TRUE) playsound(user, 'sound/items/welder.ogg', 75, TRUE)
if(ishuman(target)) if(ishuman(target))