mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-14 04:02:31 +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
@@ -90,10 +90,10 @@
|
||||
if("paint")
|
||||
do_paint(inserted)
|
||||
temp = "Painted Successfully!"
|
||||
if(istype(inserted, /mob/living/simple_mob))
|
||||
if(isanimal(inserted))
|
||||
var/mob/living/simple_mob/M = inserted
|
||||
M.has_recoloured = TRUE
|
||||
if(istype(inserted, /mob/living/silicon/robot))
|
||||
if(isrobot(inserted))
|
||||
var/mob/living/silicon/robot/R = inserted
|
||||
R.has_recoloured = TRUE
|
||||
Destroy()
|
||||
|
||||
@@ -175,7 +175,7 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
|
||||
bluespace_things |= teleatom.search_contents_for(item)
|
||||
|
||||
//VOREStation Addition Start: Prevent taurriding abuse
|
||||
if(istype(teleatom, /mob/living))
|
||||
if(isliving(teleatom))
|
||||
var/mob/living/L = teleatom
|
||||
if(LAZYLEN(L.buckled_mobs))
|
||||
for(var/mob/rider in L.buckled_mobs)
|
||||
@@ -185,7 +185,7 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
|
||||
|
||||
if(bluespace_things.len)
|
||||
precision = max(rand(1,100)*bluespace_things.len,100)
|
||||
if(istype(teleatom, /mob/living))
|
||||
if(isliving(teleatom))
|
||||
var/mob/living/MM = teleatom
|
||||
to_chat(MM, span_danger("The Bluespace interface on your [teleatom] interferes with the teleport!"))
|
||||
return 1
|
||||
@@ -196,7 +196,7 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
|
||||
return 0
|
||||
|
||||
if(!isemptylist(teleatom.search_contents_for(/obj/item/disk/nuclear)))
|
||||
if(istype(teleatom, /mob/living))
|
||||
if(isliving(teleatom))
|
||||
var/mob/living/MM = teleatom
|
||||
MM.visible_message(span_danger("\The [MM] bounces off of the portal!"),span_warning("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
|
||||
else
|
||||
@@ -216,7 +216,7 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
|
||||
var/obstructed = 0
|
||||
var/turf/dest_turf = get_turf(destination)
|
||||
if(local && !(dest_turf.z in using_map.player_levels))
|
||||
if(istype(teleatom, /mob/living))
|
||||
if(isliving(teleatom))
|
||||
to_chat(teleatom, span_warning("The portal refuses to carry you that far away!"))
|
||||
return 0
|
||||
else if(istype(destination.loc, /obj/belly))
|
||||
|
||||
@@ -142,7 +142,7 @@ GENERAL_PROTECT_DATUM(/datum/managed_browser/feedback_form)
|
||||
return
|
||||
|
||||
my_client.mob << browse(null, "window=[browser_id]") // Closes the window.
|
||||
if(istype(my_client.mob, /mob/new_player))
|
||||
if(isnewplayer(my_client.mob))
|
||||
var/mob/new_player/NP = my_client.mob
|
||||
NP.new_player_panel_proc() // So the feedback button goes away, if the user gets put on cooldown.
|
||||
qdel(src)
|
||||
|
||||
@@ -231,7 +231,7 @@
|
||||
|
||||
var/list/possible_targets = list("Free objective")
|
||||
for(var/datum/mind/possible_target in ticker.minds)
|
||||
if ((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
|
||||
if ((possible_target != src) && ishuman(possible_target.current))
|
||||
possible_targets += possible_target.current
|
||||
|
||||
var/mob/def_target = null
|
||||
@@ -376,7 +376,7 @@
|
||||
log_admin("[key_name_admin(usr)] has unemag'ed [R].")
|
||||
|
||||
if("unemagcyborgs")
|
||||
if (istype(current, /mob/living/silicon/ai))
|
||||
if (isAI(current))
|
||||
var/mob/living/silicon/ai/ai = current
|
||||
for (var/mob/living/silicon/robot/R in ai.connected_robots)
|
||||
R.emagged = 0
|
||||
|
||||
@@ -26,7 +26,7 @@ var/global/datum/repository/crew/crew_repository = new()
|
||||
var/turf/pos = get_turf(C)
|
||||
var/area/B = pos?.loc //VOREStation Add: No sensor in Dorm
|
||||
if((C.has_sensor) && (pos?.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(B.flag_check(AREA_BLOCK_SUIT_SENSORS)) && !(is_jammed(C)) && !(is_vore_jammed(C))) //VOREStation Edit
|
||||
if(istype(C.loc, /mob/living/carbon/human))
|
||||
if(ishuman(C.loc))
|
||||
var/mob/living/carbon/human/H = C.loc
|
||||
if(H.w_uniform != C)
|
||||
continue
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
general.fields["sex"] = I.sex
|
||||
else
|
||||
var/mob/living/carbon/human/H
|
||||
if(istype(user,/mob/living/carbon/human))
|
||||
if(ishuman(user))
|
||||
H = user
|
||||
general.fields["age"] = H.age
|
||||
else
|
||||
@@ -106,4 +106,3 @@
|
||||
var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "Fake Radiation Storm", add_to_queue = 0)
|
||||
new/datum/event/radiation_storm/syndicate(EM)
|
||||
return 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user