Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138

[MIRROR] Structure istype define

code/__DEFINES/is_helpers.dm

@@ -138,6 +138,8 @@
 
 #define isitem(A) (istype(A, /obj/item))
 
+#define isstructure(A) (istype(A, /obj/structure))
+
 #define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable
 
 #define isorgan(A) (istype(A, /obj/item/organ))

code/datums/forced_movement.dm

@@ -84,7 +84,7 @@
 
 /mob/Collide(atom/A)
 	. = ..()
-	if(force_moving && force_moving.allow_climbing && istype(A, /obj/structure))
+	if(force_moving && force_moving.allow_climbing && isstructure(A))
 		var/obj/structure/S = A
 		if(S.climbable)
 			S.do_climb(src)

code/modules/awaymissions/capture_the_flag.dm

@@ -320,7 +320,7 @@
 	for(var/atm in A)
 		if(!is_type_in_typecache(atm, ctf_object_typecache))
 			qdel(atm)
-		if(istype(atm, /obj/structure))
+		if(isstructure(atm))
 			var/obj/structure/S = atm
 			S.obj_integrity = S.max_integrity
 

code/modules/mob/living/carbon/human/interactive.dm

@@ -667,7 +667,7 @@
 						equip_to_appropriate_slot(MYID)
 		//THIEVING SKILLS END
 		//-------------TOUCH ME
-		if(istype(TARGET, /obj/structure))
+		if(isstructure(TARGET))
 			var/obj/structure/STR = TARGET
 			if(main_hand)
 				var/obj/item/W = main_hand

code/modules/mob/living/simple_animal/friendly/cockroach.dm

@@ -42,7 +42,7 @@
 				else
 					visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
 	else
-		if(istype(AM, /obj/structure))
+		if(isstructure(AM))
 			if(prob(squish_chance))
 				AM.visible_message("<span class='notice'>[src] was crushed under [AM].</span>")
 				adjustBruteLoss(1)

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -275,7 +275,7 @@
 						if(O.anchored)
 							continue
 
-						if(isitem(O) || istype(O, /obj/structure) || istype(O, /obj/machinery))
+						if(isitem(O) || isstructure(O) || istype(O, /obj/machinery))
 							cocoon_target = O
 							busy = MOVING_TO_TARGET
 							stop_automated_movement = 1

code/modules/mob/living/simple_animal/hostile/mimic.dm

@@ -130,7 +130,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca
 		faction |= "\ref[owner]"
 
 /mob/living/simple_animal/hostile/mimic/copy/proc/CheckObject(obj/O)
-	if((isitem(O) || istype(O, /obj/structure)) && !is_type_in_list(O, GLOB.protected_objects))
+	if((isitem(O) || isstructure(O)) && !is_type_in_list(O, GLOB.protected_objects))
 		return 1
 	return 0
 
@@ -144,7 +144,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca
 		icon_living = icon_state
 		copy_overlays(O)
 		add_overlay(googly_eyes)
-		if(istype(O, /obj/structure) || istype(O, /obj/machinery))
+		if(isstructure(O) || istype(O, /obj/machinery))
 			health = (anchored * 50) + 50
 			destroy_objects = 1
 			if(O.density && O.anchored)

code/modules/power/singularity/containment_field.dm

@@ -58,7 +58,7 @@
 	if(isliving(mover))
 		shock(mover)
 
-	if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
+	if(istype(mover, /obj/machinery) || isstructure(mover) || istype(mover, /obj/mecha))
 		bump_field(mover)
 
 /obj/machinery/field/containment/proc/set_master(master1,master2)
@@ -90,13 +90,13 @@
 	if(isliving(mover))
 		shock(mover)
 		return
-	if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
+	if(istype(mover, /obj/machinery) || isstructure(mover) || istype(mover, /obj/mecha))
 		bump_field(mover)
 		return
 
 
 /obj/machinery/field/CanPass(atom/movable/mover, turf/target)
-	if(hasShocked || isliving(mover) || istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
+	if(hasShocked || isliving(mover) || istype(mover, /obj/machinery) || isstructure(mover) || istype(mover, /obj/mecha))
 		return FALSE
 	return ..()
 

code/modules/power/tesla/energy_ball.dm

@@ -244,7 +244,7 @@
 		else if(closest_blob)
 			continue
 
-		else if(istype(A, /obj/structure))
+		else if(isstructure(A))
 			var/obj/structure/S = A
 			var/dist = get_dist(source, A)
 			if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !S.being_shocked)

code/modules/projectiles/projectile/magic.dm

@@ -295,7 +295,7 @@
 	..()
 
 /atom/proc/animate_atom_living(var/mob/living/owner = null)
-	if((isitem(src) || istype(src, /obj/structure)) && !is_type_in_list(src, GLOB.protected_objects))
+	if((isitem(src) || isstructure(src)) && !is_type_in_list(src, GLOB.protected_objects))
 		if(istype(src, /obj/structure/statue/petrified))
 			var/obj/structure/statue/petrified/P = src
 			if(P.petrified_mob)