shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cult vs Cult changes, Ratvar side

Browse Source 
Changes the hardstuns by kindle and spearthrow into debuffs if attacking hostile (Nar'Sian) cultists
This commit is contained in:
DeltaFire
2019-11-14 21:01:08 +01:00
parent 0a27f2266f
commit 9e9528dced
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
+17 -9
View File
@@ -179,6 +179,7 @@
. = ..()
/obj/item/projectile/kindle/on_hit(atom/target, blocked = FALSE)
var/narsiandog_punish = 8
if(isliving(target))
var/mob/living/L = target
if(is_servant_of_ratvar(L) || L.stat || L.has_status_effect(STATUS_EFFECT_KINDLE))
@@ -193,15 +194,22 @@
L.visible_message("<span class='warning'>[L]'s eyes flare with dim light!</span>")
playsound(L, 'sound/weapons/sear.ogg', 50, TRUE)
else
L.visible_message("<span class='warning'>[L]'s eyes blaze with brilliant light!</span>", \
"<span class='userdanger'>Your vision suddenly screams with white-hot light!</span>")
L.Knockdown(15, TRUE, FALSE, 15)
L.apply_status_effect(STATUS_EFFECT_KINDLE)
L.flash_act(1, 1)
if(issilicon(target))
var/mob/living/silicon/S = L
S.emp_act(EMP_HEAVY)
if(iscultist(L))
if(!iscultist(L))
L.visible_message("<span class='warning'>[L]'s eyes blaze with brilliant light!</span>", \
"<span class='userdanger'>Your vision suddenly screams with white-hot light!</span>")
L.Knockdown(15, TRUE, FALSE, 15)
L.apply_status_effect(STATUS_EFFECT_KINDLE)
L.flash_act(1, 1)
if(issilicon(target))
var/mob/living/silicon/S = L
S.emp_act(EMP_HEAVY)
else //for Nar'sian weaklings
L.visible_message("<span class='warning'>[L]'s eyes flare with burning light!</span>", \
"<span class='userdanger'>Your vision suddenly screams with a flash of burning hot light!</span>") //Debuffs Narsian cultists hard + deals some burn instead of just hardstunning them; Only the confusion part can stack
L.flash_act(1,1)
L.stuttering = max(narsiandog_punish, L.stuttering)
L.drowsy = max(narsiandog_punish, L.drowsy)
L.confused += narsiandog_punish
L.adjustFireLoss(15)
..()
code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm
+5 -1
View File
@@ -13,6 +13,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
w_class = WEIGHT_CLASS_BULKY
var/bonus_burn = 5
var/narsiandog_confuse = 5
/obj/item/clockwork/weapon/ratvarian_spear/ratvar_act()
if(GLOB.ratvar_awakens) //If Ratvar is alive, the spear is extremely powerful
@@ -56,8 +57,11 @@
L.visible_message("<span class='warning'>[src] bounces off of [L], as if repelled by an unseen force!</span>")
else if(!..())
if(!L.anti_magic_check())
if(issilicon(L) || iscultist(L))
if(issilicon(L))
L.Knockdown(100)
else if(iscultist(L))
L.confused += narsiandog_confuse // Spearthrow now confuses enemy cultists + just deals extra damage instead of hardstunning + damage
to_chat(L, "<span class ='userdanger'>[scr] crashes into you, sending you reeling</span>")
else
L.Knockdown(40)
GLOB.clockwork_vitality += L.adjustFireLoss(bonus_burn * 3) //normally a total of 40 damage, 70 with ratvar