cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42586 from 4dplanner/antimagic

Browse Source 
Antimagic works again
This commit is contained in:
Jordan Brown
2019-01-30 11:33:48 -05:00
committed by GitHub
parent 6887eda197 7ad8fa48c6
commit 84a1b0cd6c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/anti_magic.dm
+3 -3
View File
@@ -33,12 +33,12 @@
UnregisterSignal(user, COMSIG_MOB_RECEIVE_MAGIC)
/datum/component/anti_magic/proc/protect(datum/source, mob/user, _magic, _holy, major, self, list/protection_sources)
if(((_magic && magic) || (_holy && holy)) && (self && blocks_self))
if(((_magic && magic) || (_holy && holy)) && (!self || blocks_self))
protection_sources += parent
reaction.Invoke(user, major)
reaction?.Invoke(user, major)
if(major)
charges--
if(charges <= 0)
expire.Invoke(user)
expire?.Invoke(user)
return COMPONENT_BLOCK_MAGIC