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

[MIRROR] Structure istype define

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)