Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes cult spear not an instant stun. #19343

Merged
merged 3 commits into from
Nov 2, 2022
Merged

Makes cult spear not an instant stun. #19343

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a8c0c8
Makes cult spear not an instant stun.
Qwertytoforty Oct 10, 2022
7f08b94
Apply suggestions from code review
Qwertytoforty Oct 29, 2022
17cb328
requested changes
Qwertytoforty Oct 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions code/game/gamemodes/cult/cult_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -596,7 +596,23 @@
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)
var/datum/status_effect/cult_stun_mark/S = L.has_status_effect(STATUS_EFFECT_CULT_STUN)
Qwertytoforty marked this conversation as resolved.
Show resolved Hide resolved
if(S)
farie82 marked this conversation as resolved.
Show resolved Hide resolved
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(hit_atom))
Qwertytoforty marked this conversation as resolved.
Show resolved Hide resolved
var/mob/living/silicon/B = L
B.emp_act(EMP_HEAVY)
Qwertytoforty marked this conversation as resolved.
Show resolved Hide resolved
else if(iscarbon(hit_atom))
Qwertytoforty marked this conversation as resolved.
Show resolved Hide resolved
var/mob/living/carbon/C = L
C.Silence(6 SECONDS)
C.Stuttering(16 SECONDS)
C.CultSlur(20 SECONDS)
C.Jitter(16 SECONDS)
Qwertytoforty marked this conversation as resolved.
Show resolved Hide resolved
break_spear(T)
else
..()
Expand Down Expand Up @@ -656,7 +672,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"
Expand Down