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

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

Browse Source 
This reverts commit 08c8f744a9.
This commit is contained in:
Archie
2021-01-08 17:03:24 -03:00
parent 08c8f744a9
commit 87ce4d858c
141 changed files with 12700 additions and 12694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/mind_transfer.dm
+1 -1
View File
@@ -61,7 +61,7 @@ Also, you never added distance checking after target is selected. I've went ahea
return
var/datum/mind/TM = target.mind
if((target.anti_magic_check() || TM.has_antag_datum(/datum/antagonist/wizard) || TM.has_antag_datum(/datum/antagonist/cult) || TM.has_antag_datum(/datum/antagonist/clockcult) || TM.has_antag_datum(/datum/antagonist/changeling) || TM.has_antag_datum(/datum/antagonist/rev)) || cmptext(copytext(target.key,1,2),"@"))
if(target.anti_magic_check(TRUE, FALSE) || TM.has_antag_datum(/datum/antagonist/wizard) || TM.has_antag_datum(/datum/antagonist/cult) || TM.has_antag_datum(/datum/antagonist/clockcult) || TM.has_antag_datum(/datum/antagonist/changeling) || TM.has_antag_datum(/datum/antagonist/rev) || target.key[1] == "@")
if(!silent)
to_chat(user, "<span class='warning'>[target.p_their(TRUE)] mind is resisting your spell!</span>")
return