Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486

[MIRROR] Moves several clothing-specific flags from /atom to their proper type

code/modules/hydroponics/beekeeping/beebox.dm

@@ -18,8 +18,11 @@
 /mob/living/carbon/human/bee_friendly()
 	if(dna && dna.species && dna.species.id == "pod") //bees pollinate plants, duh.
 		return 1
-	if((wear_suit && (wear_suit.flags_1 & THICKMATERIAL_1)) && (head && (head.flags_1 & THICKMATERIAL_1)))
-		return 1
+	if (wear_suit && head && is_type_in_typecache(wear_suit, GLOB.typecache_clothing) && is_type_in_typecache(wear_suit, GLOB.typecache_clothing))
+		var/obj/item/clothing/CS = wear_suit
+		var/obj/item/clothing/CH = head
+		if (CS.clothing_flags & CH.clothing_flags & THICKMATERIAL)
+			return 1
 	return 0
 
 

code/modules/hydroponics/beekeeping/beekeeper_suit.dm

@@ -4,7 +4,7 @@
 	desc = "Keeps the lil buzzing buggers out of your eyes."
 	icon_state = "beekeeper"
 	item_state = "beekeeper"
-	flags_1 = THICKMATERIAL_1
+	clothing_flags = THICKMATERIAL
 
 
 /obj/item/clothing/suit/beekeeper_suit
@@ -12,5 +12,4 @@
 	desc = "Keeps the lil buzzing buggers away from your squishy bits."
 	icon_state = "beekeeper"
 	item_state = "beekeeper"
-	flags_1 = THICKMATERIAL_1
-
+	clothing_flags = THICKMATERIAL