mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Fixed an issue with multiple boot/shoe overlays.
This commit is contained in:
@@ -592,6 +592,7 @@ var/list/global/slot_flags_enumeration = list(
|
||||
blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
|
||||
return 1 //we applied blood to the item
|
||||
|
||||
|
||||
/obj/item/proc/generate_blood_overlay()
|
||||
if(blood_overlay)
|
||||
return
|
||||
|
||||
@@ -565,9 +565,12 @@
|
||||
overlays += image(icon, "[icon_state]_knife")
|
||||
if(contaminated)
|
||||
overlays += contamination_overlay
|
||||
<<<<<<< HEAD
|
||||
if(gurgled) //VOREStation Edit Start
|
||||
decontaminate()
|
||||
gurgle_contaminate() //VOREStation Edit End
|
||||
=======
|
||||
>>>>>>> 02c0e63... Merge pull request #6436 from Cameron653/Boot_Fix
|
||||
if(ismob(usr))
|
||||
var/mob/M = usr
|
||||
M.update_inv_shoes()
|
||||
|
||||
Reference in New Issue
Block a user