cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] some istype to macros (#9802)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-05 15:01:49 -07:00
committed by GitHub
parent 73486c399b
commit ed79946ade
409 changed files with 750 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/spells/spell_code.dm
View File

@@ -139,7 +139,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
if(overlay)
var/location
if(istype(target,/mob/living))
if(isliving(target))
location = target.loc
else if(istype(target,/turf))
location = target
@@ -155,7 +155,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
/spell/proc/after_cast(list/targets)
for(var/atom/target in targets)
var/location = get_turf(target)
if(istype(target,/mob/living) && message)
if(isliving(target) && message)
to_chat(target, "[message]")
if(sparks_spread)
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
@@ -198,7 +198,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
if(findNullRod(T))
return 0
if(istype(user, /mob/living/simple_mob) && holder == user)
if(isanimal(user) && holder == user)
var/mob/living/simple_mob/SM = user
if(SM.purge)
to_chat(SM, span_warning("The nullrod's power interferes with your own!"))