mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
[MIRROR] some istype to macros (#9802)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
73486c399b
commit
ed79946ade
@@ -100,7 +100,7 @@
|
||||
to_chat(user, span_notice("You feed the slime the agent, removing its hunger and calming it."))
|
||||
|
||||
// Simple Mobs.
|
||||
else if(istype(M, /mob/living/simple_mob))
|
||||
else if(isanimal(M))
|
||||
var/mob/living/simple_mob/SM = M
|
||||
if(!(SM.mob_class & MOB_CLASS_SLIME|MOB_CLASS_ANIMAL)) // So you can't use this on Russians/syndies/hivebots/etc.
|
||||
to_chat(user, span_warning("\The [SM] only works on slimes and animals."))
|
||||
|
||||
@@ -91,7 +91,7 @@ VORESTATION REMOVAL
|
||||
agony = 3
|
||||
|
||||
/obj/item/projectile/beam/stun/xeno/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null)
|
||||
if(istype(target, /mob/living))
|
||||
if(isliving(target))
|
||||
var/mob/living/L = target
|
||||
if(L.mob_class & MOB_CLASS_SLIME)
|
||||
if(isslime(L))
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
to_chat(user,span_warning("Your rehydrator flashes an error as it attempts to process your target."))
|
||||
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
|
||||
return
|
||||
if(istype(A, /mob/living))
|
||||
if(isliving(A))
|
||||
to_chat(user,span_warning("The rehydrator's saftey systems prevent firing into living creatures!"))
|
||||
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
|
||||
return
|
||||
@@ -138,7 +138,7 @@
|
||||
if(S.stat != DEAD)
|
||||
return FALSE
|
||||
return TRUE
|
||||
if(istype(AM, /mob/living/carbon/human))
|
||||
if(ishuman(AM))
|
||||
var/mob/living/carbon/human/H = AM
|
||||
if(!istype(H.species, /datum/species/monkey))
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user