cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merges tinfoil (hat) protection into the anti_magic component. Implements it on Hivemind gamemode and telepathy.

Browse Source
This commit is contained in:
yogstation13-bot
2019-05-30 09:27:43 +01:00
parent 25c9801794
commit 72efa0c444
31 changed files with 262 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/status_effects/debuffs.dm
View File

@@ -229,7 +229,7 @@
/datum/status_effect/belligerent/proc/do_movement_toggle(force_damage)
var/number_legs = owner.get_num_legs(FALSE)
if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.anti_magic_check(major = FALSE) && number_legs)
if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.anti_magic_check(chargecost = 0) && number_legs)
if(force_damage || owner.m_intent != MOVE_INTENT_WALK)
if(GLOB.ratvar_awakens)
owner.Paralyze(20)
@@ -322,7 +322,7 @@
if(owner.confused)
owner.confused = 0
severity = 0
else if(!owner.anti_magic_check(major = FALSE) && owner.stat != DEAD && severity)
else if(!owner.anti_magic_check(chargecost = 0) && owner.stat != DEAD && severity)
var/static/hum = get_sfx('sound/effects/screech.ogg') //same sound for every proc call
if(owner.getToxLoss() > MANIA_DAMAGE_TO_CONVERT)
if(is_eligible_servant(owner))