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

Merge pull request #11409 from necromanceranne/taser_nerf

Browse Source 
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
This commit is contained in:
Ghom
2020-03-12 00:30:52 +01:00
committed by GitHub
parent d30ba9721c e0df350579
commit 9f681e9a76
6 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/energy/stun.dm
+1 -1
View File
@@ -27,7 +27,7 @@
C.IgniteMob()
if(C.dna && C.dna.check_mutation(HULK))
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
else if(tase_duration && (C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE))
else if(tase_duration && (C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE) && !HAS_TRAIT(C, TRAIT_TASED_RESISTANCE))
C.apply_status_effect(strong_tase? STATUS_EFFECT_TASED : STATUS_EFFECT_TASED_WEAK, tase_duration)
addtimer(CALLBACK(C, /mob/living/carbon.proc/do_jitter_animation, jitter), 5)