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:
deathride58
2017-11-22 14:47:15 -05:00
committed by GitHub
parent 2dbe3e3b82
commit 5e6e725666
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/color.dm
-5
View File
@@ -77,13 +77,8 @@
name = "insulated gloves" name = "insulated gloves"
desc = "These gloves will protect the wearer from electric shock." desc = "These gloves will protect the wearer from electric shock."
siemens_coefficient = 0 siemens_coefficient = 0
<<<<<<< HEAD
permeability_coefficient = 0.5 permeability_coefficient = 0.5
resistance_flags = 0
=======
permeability_coefficient = 0.05
resistance_flags = NONE resistance_flags = NONE
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
/obj/item/clothing/gloves/color/rainbow /obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves" name = "rainbow gloves"