shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update color.dm

Browse Source
This commit is contained in:
LetterJay
2017-12-30 13:37:23 -06:00
committed by GitHub
parent a958de3d96
commit 4d3b7ddcbd
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/clothing/gloves/color.dm
View File

@@ -205,18 +205,9 @@
/obj/item/clothing/gloves/color/brown = 1)
var/obj/item/clothing/gloves/color/selected = pick(gloves)
<<<<<<< HEAD
name = initial(selected.name)
desc = initial(selected.desc)
icon_state = initial(selected.icon_state)
item_state = initial(selected.item_state)
item_color = initial(selected.item_color)
=======
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
H.equip_to_slot_or_del(new selected(H), slot_gloves)
else
new selected(loc)
return INITIALIZE_HINT_QDEL
>>>>>>> c063902... Merge pull request #33930 from ShizCalev/undersuit-fix