Makes cult spear not an instant stun. (#19343)

* Makes cult spear not an instant stun.

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* requested changes

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2022-11-02 20:23:40 +01:00
committed by GitHub
co-authored by Farie82
parent d5b261407e
commit a7bef74380
+20 -5
View File
@@ -565,7 +565,7 @@
force = 17
force_unwielded = 17
force_wielded = 24
throwforce = 40
throwforce = 30
throw_speed = 2
armour_penetration_percentage = 50
block_chance = 30
@@ -595,9 +595,24 @@
else
L.visible_message("<span class='warning'>[src] bounces off of [L], as if repelled by an unseen force!</span>")
else if(!..())
if(!L.null_rod_check())
L.Weaken(6 SECONDS)
break_spear(T)
if(L.null_rod_check())
return
var/datum/status_effect/cult_stun_mark/S = L.has_status_effect(STATUS_EFFECT_CULT_STUN)
if(S)
S.trigger()
else
L.KnockDown(10 SECONDS)
L.adjustStaminaLoss(60)
L.apply_status_effect(STATUS_EFFECT_CULT_STUN)
L.flash_eyes(1, TRUE)
if(issilicon(L))
L.emp_act(EMP_HEAVY)
else if(iscarbon(L))
L.Silence(6 SECONDS)
L.Stuttering(16 SECONDS)
L.CultSlur(20 SECONDS)
L.Jitter(16 SECONDS)
break_spear(T)
else
..()
@@ -656,7 +671,7 @@
var/mob/living/L = spear.loc
L.unEquip(spear)
L.visible_message("<span class='warning'>An unseen force pulls the blood spear from [L]'s hands!</span>")
spear.throw_at(owner, 10, 2, null)
spear.throw_at(owner, 10, 2, null, dodgeable = FALSE)
/obj/item/gun/projectile/shotgun/boltaction/enchanted/arcane_barrage/blood
name = "blood bolt barrage"