From f169a5f8bf86a61627c44d1d197b223ca8a23f0c Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Tue, 19 Feb 2019 21:51:53 -0600
Subject: [PATCH] fixes zaddat mask problem

---
 code/modules/clothing/masks/gasmask.dm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index f3dd101058..2d1c8f3e91 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -85,6 +85,19 @@
 	feeding_port(user)
 	..()
 
+<<<<<<< HEAD
+=======
+/obj/item/clothing/mask/gas/zaddat
+	name = "Zaddat Veil"
+	desc = "A clear survival mask used by the Zaddat to filter out harmful nitrogen. Can be connected to an air supply and reconfigured to allow for safe eating."
+	icon_state = "zaddat_mask"
+	item_state = "vax_mask"
+	//body_parts_covered = 0
+	species_restricted = list(SPECIES_ZADDAT)
+	flags_inv = HIDEEARS //semi-transparent
+	filtered_gases = list("phoron", "nitrogen", "sleeping_agent")
+
+>>>>>>> 3c5bb87... Merge pull request #5972 from elgeonmb/patch-11
 /obj/item/clothing/mask/gas/syndicate
 	name = "tactical mask"
 	desc = "A close-fitting tactical mask that can be connected to an air supply."