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
@@ -151,7 +151,7 @@
|
||||
if(M.buckled)
|
||||
return
|
||||
|
||||
if(istype(M,/mob/living/carbon/human))
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.shoes && H.shoes.item_flags & NOSLIP)
|
||||
return
|
||||
@@ -179,7 +179,7 @@
|
||||
//TODO: generalize this.
|
||||
to_chat(user, span_notice("You add some cable to the [src.name] and slide it inside the battery casing."))
|
||||
var/obj/item/cell/potato/pocell = new /obj/item/cell/potato(get_turf(user))
|
||||
if(src.loc == user && istype(user,/mob/living/carbon/human))
|
||||
if(src.loc == user && ishuman(user))
|
||||
user.put_in_hands(pocell)
|
||||
pocell.maxcharge = src.potency * 200
|
||||
pocell.charge = pocell.maxcharge
|
||||
|
||||
@@ -274,7 +274,7 @@
|
||||
qdel(thrown)
|
||||
return
|
||||
|
||||
if(istype(target,/mob/living))
|
||||
if(isliving(target))
|
||||
splatted = apply_special_effect(target,thrown)
|
||||
else if(istype(target,/turf))
|
||||
splatted = 1
|
||||
@@ -853,7 +853,7 @@
|
||||
product.force = 1
|
||||
|
||||
//Handle spawning in living, mobile products (like dionaea).
|
||||
if(istype(product,/mob/living))
|
||||
if(isliving(product))
|
||||
product.visible_message(span_notice("The pod disgorges [product]!"))
|
||||
handle_living_product(product)
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
//grabbing people
|
||||
if(!victim.anchored && Adjacent(victim) && victim.loc != src.loc)
|
||||
var/can_grab = 1
|
||||
if(istype(victim, /mob/living/carbon/human))
|
||||
if(ishuman(victim))
|
||||
var/mob/living/carbon/human/H = victim
|
||||
if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.item_flags & NOSLIP))
|
||||
can_grab = 0
|
||||
|
||||
@@ -441,7 +441,7 @@
|
||||
|
||||
if(usr.incapacitated())
|
||||
return
|
||||
if(ishuman(usr) || istype(usr, /mob/living/silicon/robot))
|
||||
if(ishuman(usr) || isrobot(usr))
|
||||
if(labelled)
|
||||
to_chat(usr, span_filter_notice("You remove the label."))
|
||||
labelled = null
|
||||
@@ -457,7 +457,7 @@
|
||||
|
||||
if(usr.incapacitated())
|
||||
return
|
||||
if(ishuman(usr) || istype(usr, /mob/living/silicon/robot))
|
||||
if(ishuman(usr) || isrobot(usr))
|
||||
var/new_light = tgui_input_list(usr, "Specify a light level.", "Light Level", list(0,1,2,3,4,5,6,7,8,9,10))
|
||||
if(new_light)
|
||||
tray_light = new_light
|
||||
@@ -706,7 +706,7 @@
|
||||
if(usr.incapacitated())
|
||||
return
|
||||
|
||||
if(ishuman(usr) || istype(usr, /mob/living/silicon/robot))
|
||||
if(ishuman(usr) || isrobot(usr))
|
||||
close_lid(usr)
|
||||
return
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
var/obj/item/paper/P = new /obj/item/paper(get_turf(src))
|
||||
P.name = "paper - [form_title]"
|
||||
P.info = "[dat]"
|
||||
if(istype(user,/mob/living/carbon/human))
|
||||
if(ishuman(user))
|
||||
user.put_in_hands(P)
|
||||
user.visible_message("\The [src] spits out a piece of paper.")
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user