Replaces "istype"s with is_helpers macros (#28676)

This commit is contained in:
nicbn
2017-06-22 15:03:19 -03:00
committed by Leo
parent 4ac64a7014
commit 77a2d3f5cd
125 changed files with 192 additions and 184 deletions
+1 -1
View File
@@ -49,7 +49,7 @@
if(!open)
return
if(!istype(M, /mob))
if(!ismob(M))
return
if(ishuman(M))
@@ -64,7 +64,7 @@
else
explosion(location, boom_sizes[1], boom_sizes[2], boom_sizes[3])
location.ex_act(2, target)
if(istype(target, /mob))
if(ismob(target))
var/mob/M = target
M.gib()
qdel(src)
+2 -2
View File
@@ -31,7 +31,7 @@
return
// chance of monkey retaliation
if(istype(C, /mob/living/carbon/monkey) && prob(MONKEY_CUFF_RETALIATION_PROB))
if(ismonkey(C) && prob(MONKEY_CUFF_RETALIATION_PROB))
var/mob/living/carbon/monkey/M
M = C
M.retaliate(user)
@@ -303,7 +303,7 @@
addtimer(CALLBACK(src, .proc/dissipate), 100)
/obj/item/weapon/restraints/legcuffs/beartrap/energy/proc/dissipate()
if(!istype(loc, /mob))
if(!ismob(loc))
do_sparks(1, TRUE, src)
qdel(src)
@@ -64,7 +64,7 @@
if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)))
usr.set_machine(src)
if(istype(loc, /mob))
if(ismob(loc))
attack_self(loc)
else
for(var/mob/M in viewers(1, src))
@@ -69,7 +69,7 @@
updateTank(tank, 1, user)
else if(loadedWeightClass >= maxWeightClass)
to_chat(user, "<span class='warning'>\The [src] can't hold any more items!</span>")
else if(istype(W, /obj/item))
else if(isitem(W))
var/obj/item/IW = W
load_item(IW, user)
@@ -35,7 +35,7 @@
/obj/item/weapon/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder)
for(var/atom/X in orange(5,pull))
if(istype(X, /atom/movable))
if(ismovableatom(X))
var/atom/movable/A = X
if(A == wielder)
continue
@@ -155,7 +155,7 @@
cut_overlays()
/obj/item/weapon/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M, /mob))
if(!ismob(M))
return
var/obj/item/clothing/mask/cigarette/cig = locate(/obj/item/clothing/mask/cigarette) in contents
if(cig)
@@ -62,7 +62,7 @@
/obj/item/weapon/storage/MouseDrop_T(atom/movable/O, mob/user)
if(istype(O, /obj/item))
if(isitem(O))
var/obj/item/I = O
if(iscarbon(user) || isdrone(user))
var/mob/living/L = user
@@ -114,7 +114,7 @@ Frequency:
else
if (href_list["temp"])
src.temp = null
if (istype(src.loc, /mob))
if (ismob(src.loc))
attack_self(src.loc)
else
for(var/mob/M in viewers(1, src))
+1 -1
View File
@@ -622,7 +622,7 @@
/obj/item/weapon/twohanded/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity)
if(!proximity || !wielded)
return
if(istype(target, /turf/closed/wall))
if(iswallturf(target))
var/turf/closed/wall/W = target
user.visible_message("<span class='danger'>[user] blasts \the [target] with \the [src]!</span>")
playsound(target, 'sound/magic/disintegrate.ogg', 100, 1)