deal with merge conflict

Monkestation · Dec 26, 2024 · 9032081 · 9032081
1 parent a5696a3
commit 9032081
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/icons/mob/clothing/ears.dmi b/icons/mob/clothing/ears.dmi
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
diff --git a/monkestation/code/modules/clothing/masks/misc.dm b/monkestation/code/modules/clothing/masks/misc.dm
@@ -64,7 +64,7 @@
 /obj/item/clothing/mask/breath/sec_bandana
 	desc = "An incredibly dense synthetic thread bandana that can be used as an internals mask."
 	name = "sec bandana"
-	worn_icon = 'monkestation/icons/mob/mask.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/mask.dmi'
 	icon = 'monkestation/icons/obj/clothing/masks.dmi'
 	icon_state = "sec_bandana_default"
 	var/obj/item/clothing/suit/armor/secduster/suit

diff --git a/monkestation/icons/mob/clothing/mask.dmi b/monkestation/icons/mob/clothing/mask.dmi
diff --git a/monkestation/icons/mob/mask.dmi b/monkestation/icons/mob/mask.dmi