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

Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"

Browse Source 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
This commit is contained in:
KrissKr0ss
2023-05-01 00:16:20 -05:00
parent 133ad142a5
commit 66aa1cb05c
87 changed files with 6809 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+1 -1
View File
@@ -722,7 +722,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
return pick(protection_sources)
else
return src
if((magic && HAS_TRAIT(src, TRAIT_ANTIMAGIC)) || (holy && HAS_TRAIT(src, TRAIT_HOLY)))
if((magic && HAS_TRAIT(src, TRAIT_ANTIMAGIC)) || (!self && magic && HAS_TRAIT(src, TRAIT_ANTIMAGIC_NO_SELFBLOCK)) || (holy && HAS_TRAIT(src, TRAIT_HOLY)))
return src
//You can buckle on mobs if you're next to them since most are dense