cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed unfinished merge

Browse Source
This commit is contained in:
alex-gh
2014-02-14 14:22:39 +01:00
parent 5ada6ea4cc
commit 9aaf0b8a5c
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/swords_axes_etc.dm
-5
View File
@@ -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)