cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue with multiple boot/shoe overlays.

Browse Source
This commit is contained in:
Atermonera
2019-09-07 19:10:20 -08:00
committed by VirgoBot
parent 0606daf25b
commit 153a7e118a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/items.dm
View File

@@ -592,6 +592,7 @@ var/list/global/slot_flags_enumeration = list(
blood_DNA[M.dna.unique_enzymes] = M.dna.b_type blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
return 1 //we applied blood to the item return 1 //we applied blood to the item
/obj/item/proc/generate_blood_overlay() /obj/item/proc/generate_blood_overlay()
if(blood_overlay) if(blood_overlay)
return return

3
code/modules/clothing/clothing.dm
View File

@@ -565,9 +565,12 @@
overlays += image(icon, "[icon_state]_knife") overlays += image(icon, "[icon_state]_knife")
if(contaminated) if(contaminated)
overlays += contamination_overlay overlays += contamination_overlay
<<<<<<< HEAD
if(gurgled) //VOREStation Edit Start if(gurgled) //VOREStation Edit Start
decontaminate() decontaminate()
gurgle_contaminate() //VOREStation Edit End gurgle_contaminate() //VOREStation Edit End
=======
>>>>>>> 02c0e63... Merge pull request #6436 from Cameron653/Boot_Fix
if(ismob(usr)) if(ismob(usr))
var/mob/M = usr var/mob/M = usr
M.update_inv_shoes() M.update_inv_shoes()