From 153a7e118a21ad8f281703b8a38c1559a50f12e6 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sat, 7 Sep 2019 19:10:20 -0800
Subject: [PATCH] Fixed an issue with multiple boot/shoe overlays.

---
 code/game/objects/items.dm        | 1 +
 code/modules/clothing/clothing.dm | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index fdfaa22296..b651e2bfe2 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -592,6 +592,7 @@ var/list/global/slot_flags_enumeration = list(
 		blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
 	return 1 //we applied blood to the item
 
+
 /obj/item/proc/generate_blood_overlay()
 	if(blood_overlay)
 		return
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 32b672b5fe..f51037871a 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -565,9 +565,12 @@
 		overlays += image(icon, "[icon_state]_knife")
 	if(contaminated)
 		overlays += contamination_overlay
+<<<<<<< HEAD
 	if(gurgled) //VOREStation Edit Start
 		decontaminate()
 		gurgle_contaminate() //VOREStation Edit End
+=======
+>>>>>>> 02c0e63... Merge pull request #6436 from Cameron653/Boot_Fix
 	if(ismob(usr))
 		var/mob/M = usr
 		M.update_inv_shoes()