From 30ba10c9c73ec08ed9dfd4302a72e054e9767e11 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 9 Feb 2021 19:52:33 +0200 Subject: [PATCH] Update clothing.dm --- code/modules/clothing/clothing.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b23928e3921..a02622735ea 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -50,18 +50,16 @@ src.attach_accessory(null, tie) set_clothing_index() -<<<<<<< HEAD //VOREStation edit start if(polychromic) verbs |= /obj/item/clothing/proc/change_color //VOREStation edit start -======= + /obj/item/clothing/update_icon() overlays.Cut() //This removes all the overlays on the sprite and then goes down a checklist adding them as required. if(blood_DNA) add_blood() . = ..() ->>>>>>> 4fe3275... Space cleaner cleans mobs (#7802) /obj/item/clothing/equipped(var/mob/user,var/slot) ..() @@ -701,14 +699,11 @@ . = ..() if(holding) overlays += image(icon, "[icon_state]_knife") -<<<<<<< HEAD if(contaminated) overlays += contamination_overlay if(gurgled) //VOREStation Edit Start decontaminate() gurgle_contaminate() //VOREStation Edit End -======= ->>>>>>> 4fe3275... Space cleaner cleans mobs (#7802) if(ismob(usr)) var/mob/M = usr M.update_inv_shoes()