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

Fixes bartender suit having an adjust state

Browse Source
This commit is contained in:
ShizCalev
2017-11-22 12:40:32 -06:00
committed by CitadelStationBot
parent dc0128a6d3
commit 6ab499b57b
36 changed files with 517 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/color.dm
+9 -4
View File
@@ -6,7 +6,7 @@
siemens_coefficient = 0
permeability_coefficient = 0.5
item_color="yellow"
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
@@ -16,7 +16,7 @@
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
permeability_coefficient = 0.5
item_color="yellow"
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/gloves/color/fyellow/New()
..()
@@ -40,7 +40,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = 0
resistance_flags = NONE
var/can_be_cut = 1
/obj/item/clothing/gloves/color/black/hos
@@ -77,8 +77,13 @@
name = "insulated gloves"
desc = "These gloves will protect the wearer from electric shock."
siemens_coefficient = 0
<<<<<<< HEAD
permeability_coefficient = 0.5
resistance_flags = 0
=======
permeability_coefficient = 0.05
resistance_flags = NONE
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
@@ -165,7 +170,7 @@
permeability_coefficient = 0.1
item_color="white"
transfer_prints = TRUE
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/gloves/color/latex/nitrile
name = "nitrile gloves"
code/modules/clothing/gloves/miscellaneous.dm
+3 -3
View File
@@ -21,7 +21,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = 0
resistance_flags = NONE
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 30)
/obj/item/clothing/gloves/combat
@@ -36,7 +36,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = 0
resistance_flags = NONE
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 50)
@@ -53,5 +53,5 @@
cold_protection = ARMS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = 0
resistance_flags = NONE
armor = list(melee = 15, bullet = 35, laser = 35, energy = 20, bomb = 35, bio = 35, rad = 35, fire = 0, acid = 0)