From 17a181b12179cd6a1504151af352580911380ed2 Mon Sep 17 00:00:00 2001
From: Seris02 <littlenebulae421@gmail.com>
Date: Tue, 31 Dec 2019 18:02:22 +0800
Subject: [PATCH] fixed

---
 code/modules/mob/living/carbon/carbon.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index f68869d5ec..016fec5499 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -996,4 +996,3 @@
 			return TRUE
 	if(isclothing(wear_mask) && (wear_mask.clothing_flags & SCAN_REAGENTS))
 		return TRUE
->>>>>>> 8ac23f41e62ae8cff0c4b7993b19775b4a8a3b21