From 9aaf0b8a5c5a59bce0d77f25f7f5e72a87bb426c Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 14 Feb 2014 14:22:39 +0100 Subject: [PATCH] fixed unfinished merge --- code/game/objects/items/weapons/swords_axes_etc.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index deb732895a7..9769ce6478d 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -166,13 +166,8 @@ H.update_inv_r_hand() playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) add_fingerprint(user) -<<<<<<< HEAD if (!blood_DNA) return - if(blood_overlay && (blood_DNA.len >= 1)) //updates blood overlay, if any -======= - if(blood_overlay && (blood_DNA.len >= 1)) //updates blood overlay, if any ->>>>>>> 8850a43... Fixes #3847 overlays.Cut()//this might delete other item overlays as well but eeeeeeeh var/icon/I = new /icon(src.icon, src.icon_state)