cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-13 08:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merges AI Branch into Master

Browse Source
This commit is contained in:
Atermonera
2018-11-30 21:05:42 -08:00
committed by VirgoBot
parent 15017e893e
commit 2df5e9fe0e
379 changed files with 22460 additions and 4751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_code.dm
+4 -4
View File
@@ -198,10 +198,10 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
if(findNullRod(T))
return 0
if(istype(user, /mob/living/simple_animal) && holder == user)
var/mob/living/simple_animal/SA = user
if(SA.purge)
SA << "<span class='warning'>The nullrod's power interferes with your own!</span>"
if(istype(user, /mob/living/simple_mob) && holder == user)
var/mob/living/simple_mob/SM = user
if(SM.purge)
SM << "<span class='warning'>The nullrod's power interferes with your own!</span>"
return 0
if(!src.check_charge(skipcharge, user)) //sees if we can cast based on charges alone