Merge pull request #6436 from Cameron653/Boot_Fix

Fixed an issue with multiple boot/shoe overlays.
This commit is contained in:
Atermonera
2019-09-07 19:10:20 -08:00
committed by GitHub
4 changed files with 13 additions and 8 deletions
+6 -1
View File
@@ -513,6 +513,7 @@
if(usr.put_in_hands(holding))
usr.visible_message("<span class='danger'>\The [usr] pulls a knife out of their boot!</span>")
holding = null
overlays -= image(icon, "[icon_state]_knife")
else
usr << "<span class='warning'>Your need an empty, unbroken hand to do that.</span>"
holding.forceMove(src)
@@ -557,9 +558,13 @@
update_icon()
/obj/item/clothing/shoes/update_icon()
overlays.Cut()
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()
if(holding)
overlays += image(icon, "[icon_state]_knife")
if(contaminated)
overlays += contamination_overlay
if(ismob(usr))
var/mob/M = usr
M.update_inv_shoes()