From 7949c4fa01c8bd6cb61d8113f32dc0e37d0cc317 Mon Sep 17 00:00:00 2001 From: keronshb Date: Wed, 12 Feb 2020 21:24:12 -0500 Subject: [PATCH] Changes cult stunhand when halos are out Turns the stunhand into a burn + knockback hand. So it remains more defensive than offensive. --- code/modules/antagonists/cult/blood_magic.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 1bb1b8533a..a4a8b9d2a7 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -143,7 +143,7 @@ //Cult Blood Spells /datum/action/innate/cult/blood_spell/stun name = "Stun" - desc = "A potent spell that will stun and mute victims upon contact." + desc = "A potent spell that will stun and mute victims upon contact. Becomes burn and knockback when the cult has ascended!" button_icon_state = "hand" magic_path = "/obj/item/melee/blood_magic/stun" health_cost = 10 @@ -437,8 +437,15 @@ else target.visible_message("[L] starts to glow in a halo of light!", \ "A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!") - else - if(!iscultist(L)) + else // cult doesn't stun any longer when halos are out, instead it does burn damage + knockback! + var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE) + if(user_antag.cult_team.cult_ascendent) + if(!iscultist(L)) + var/atom/throw_target = get_edge_target_turf(L, user.dir) + L.adjustFireLoss(20) + if(!L.anchored) + L.throw_at(throw_target, 7, 1, user) + else if(!iscultist(L)) L.Knockdown(160) L.adjustStaminaLoss(140) //Ensures hard stamcrit L.flash_act(1,1)