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

Merge pull request #11764 from Ghommie/Ghommie-cit668

Browse Source 
Fixing spellcasting and edge cases.
This commit is contained in:
Putnam3145
2020-04-07 02:50:24 -07:00
committed by GitHub
parent 536934d1e2 b92da66f04
commit dad6ddb042
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell.dm
+2 -2
View File
@@ -436,7 +436,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if(magic_flags & SPELL_SKIP_ALL_REQS)
return TRUE
if(player_lock && (!user.mind || !(src in user.mind.spell_list) && !(src in user.mob_spell_list)))
if(player_lock ? (!user.mind || !(src in user.mind.spell_list) && !(src in user.mob_spell_list)) : !(src in user.mob_spell_list))
if(!silent)
to_chat(user, "<span class='warning'>You shouldn't have this spell! Something's wrong.</span>")
return FALSE
@@ -483,7 +483,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
to_chat(L, "<span class='notice'>You can't get the words out!</span>")
return FALSE
if(!(magic_flags & SPELL_SKIP_MOBTYPE) && ((mobs_whitelist && !mobs_whitelist[user]) || (mobs_blacklist && mobs_blacklist[user])))
if(!(magic_flags & SPELL_SKIP_MOBTYPE) && ((mobs_whitelist && !mobs_whitelist[user.type]) || (mobs_blacklist && mobs_blacklist[user.type])))
if(!silent)
to_chat(user, "<span class='notice'>This spell can't be casted in this current form!</span>")
return FALSE