Merge pull request #3476 from VOREStation/aro-goggles

Goggles are airtight

code/ZAS/Phoron.dm

@@ -103,19 +103,23 @@ obj/var/phoronproof = 0
 
 	//Burn eyes if exposed.
 	if(vsc.plc.EYE_BURNS && (species.breath_type != "phoron"))
-		if(!head)
-			if(!wear_mask)
-				burn_eyes()
-			else
-				if(!(wear_mask.body_parts_covered & EYES))
-					burn_eyes()
-		else
-			if(!(head.body_parts_covered & EYES))
-				if(!wear_mask)
-					burn_eyes()
-				else
-					if(!(wear_mask.body_parts_covered & EYES))
-						burn_eyes()
+		var/burn_eyes = 1
+
+		//Check for protective glasses
+		if(glasses && (glasses.body_parts_covered & EYES) && (glasses.item_flags & AIRTIGHT))
+			burn_eyes = 0
+
+		//Check for protective maskwear
+		if(burn_eyes && wear_mask && (wear_mask.body_parts_covered & EYES) && (wear_mask.item_flags & AIRTIGHT))
+			burn_eyes = 0
+
+		//Check for protective helmets
+		if(burn_eyes && head && (head.body_parts_covered & EYES) && (head.item_flags & AIRTIGHT))
+			burn_eyes = 0
+
+		//If we still need to, burn their eyes
+		if(burn_eyes)
+			burn_eyes()
 
 	//Genetic Corruption
 	if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != "phoron"))

code/modules/clothing/glasses/glasses.dm

@@ -89,11 +89,20 @@ BLIND     // can't see anything
 	item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses")
 	toggleable = 1
 	action_button_name = "Toggle Goggles"
+	item_flags = AIRTIGHT
 
 /obj/item/clothing/glasses/science/New()
 	..()
 	overlay = global_hud.science
 
+/obj/item/clothing/glasses/goggles
+	name = "Goggles"
+	desc = "Just some plain old goggles."
+	icon_state = "plaingoggles"
+	item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses")
+	item_flags = AIRTIGHT
+	body_parts_covered = EYES
+
 /obj/item/clothing/glasses/night
 	name = "Night Vision Goggles"
 	desc = "You can totally see in the dark now!"
@@ -200,6 +209,7 @@ BLIND     // can't see anything
 	item_state_slots = list(slot_r_hand_str = "welding-g", slot_l_hand_str = "welding-g")
 	action_button_name = "Flip Welding Goggles"
 	matter = list(DEFAULT_WALL_MATERIAL = 1500, "glass" = 1000)
+	item_flags = AIRTIGHT
 	var/up = 0
 
 /obj/item/clothing/glasses/welding/attack_self()