diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 2cd1450a97..55cf4b2ce0 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -191,7 +191,7 @@ BLIND // can't see anything
gender = PLURAL //Carn: for grammarically correct text-parsing
w_class = 2.0
icon = 'icons/obj/clothing/gloves.dmi'
- siemens_coefficient = 0.50
+ siemens_coefficient = 0.75
var/wired = 0
var/obj/item/weapon/cell/cell = 0
var/clipped = 0
@@ -397,7 +397,7 @@ BLIND // can't see anything
slot_flags = SLOT_ICLOTHING
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
w_class = 3
- var/has_sensor = 1//For the crew computer 2 = unable to change mode
+ var/has_sensor = 1 //For the crew computer 2 = unable to change mode
var/sensor_mode = 0
/*
1 = Report living/dead
@@ -406,8 +406,15 @@ BLIND // can't see anything
*/
var/list/accessories = list()
var/displays_id = 1
+ var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi')
+/obj/item/clothing/under/New()
+ //autodetect rollability
+ if(rolled_down < 0)
+ if((initial(item_color) + "_d_s") in icon_states('icons/mob/uniform.dmi'))
+ rolled_down = 0
+
/obj/item/clothing/under/update_clothing_icon()
if (ismob(src.loc))
var/mob/M = src.loc
@@ -548,17 +555,18 @@ BLIND // can't see anything
if(!istype(usr, /mob/living)) return
if(usr.stat) return
- if(initial(item_color) + "_d_s" in icon_states('icons/mob/uniform.dmi'))
- if (item_color == initial(item_color))
- body_parts_covered &= LOWER_TORSO|LEGS|FEET
- item_color = "[initial(item_color)]_d"
- else
- body_parts_covered = initial(body_parts_covered)
- item_color = initial(item_color)
-
- update_clothing_icon()
+ if(rolled_down < 0)
+ usr << "You cannot roll down [src]!"
+ return
+
+ rolled_down = !rolled_down
+ if(rolled_down)
+ body_parts_covered &= LOWER_TORSO|LEGS|FEET
+ item_color = "[initial(item_color)]_d"
else
- usr << "You cannot roll down the uniform!"
+ body_parts_covered = initial(body_parts_covered)
+ item_color = initial(item_color)
+ update_clothing_icon()
/obj/item/clothing/under/proc/remove_accessory(mob/user, obj/item/clothing/accessory/A)
if(!(A in accessories))
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 8e52dbd585..870fcc487f 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -5,7 +5,6 @@
item_state = "ygloves"
siemens_coefficient = 0
permeability_coefficient = 0.05
- item_color="yellow"
/obj/item/clothing/gloves/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly."
@@ -15,101 +14,73 @@
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
permeability_coefficient = 0.05
- item_color="yellow"
-
New()
- siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
+ //average of 0.5, somewhat better than regular gloves' 0.75
+ siemens_coefficient = pick(0,0.1,0.3,0.5,0.5,0.75,1.35)
/obj/item/clothing/gloves/black
- desc = "These gloves are fire-resistant."
+ desc = "These work gloves are thick and fire-resistant."
name = "black gloves"
icon_state = "black"
item_state = "bgloves"
- item_color="brown"
+ siemens_coefficient = 0.50
+ permeability_coefficient = 0.05
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
-
- hos
- item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
-
- ce
- item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way.
-
/obj/item/clothing/gloves/orange
name = "orange gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "orange"
item_state = "orangegloves"
- item_color="orange"
/obj/item/clothing/gloves/red
name = "red gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "red"
item_state = "redgloves"
- item_color = "red"
/obj/item/clothing/gloves/rainbow
name = "rainbow gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "rainbow"
item_state = "rainbowgloves"
- item_color = "rainbow"
-
- clown
- item_color = "clown"
/obj/item/clothing/gloves/blue
name = "blue gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "blue"
item_state = "bluegloves"
- item_color="blue"
/obj/item/clothing/gloves/purple
name = "purple gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "purple"
item_state = "purplegloves"
- item_color="purple"
/obj/item/clothing/gloves/green
name = "green gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "green"
item_state = "greengloves"
- item_color="green"
/obj/item/clothing/gloves/grey
name = "grey gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "gray"
item_state = "graygloves"
- item_color="grey"
-
- rd
- item_color = "director" //Exists for washing machines. Is not different from gray gloves in any way.
-
- hop
- item_color = "hop" //Exists for washing machines. Is not different from gray gloves in any way.
/obj/item/clothing/gloves/light_brown
name = "light brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "lightbrown"
item_state = "lightbrowngloves"
- item_color="light brown"
/obj/item/clothing/gloves/brown
name = "brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "brown"
item_state = "browngloves"
- item_color="brown"
-
- cargo
- item_color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way.
\ No newline at end of file
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index dfb370d38c..7b840471e4 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -4,10 +4,6 @@
icon_state = "captain"
item_state = "egloves"
item_color = "captain"
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
/obj/item/clothing/gloves/cyborg
desc = "beep boop borp"
@@ -21,7 +17,7 @@
name = "\improper SWAT Gloves"
icon_state = "black"
item_state = "swat_gl"
- siemens_coefficient = 0.6
+ siemens_coefficient = 0.50
permeability_coefficient = 0.05
cold_protection = HANDS
@@ -46,17 +42,14 @@
desc = "Sterile latex gloves."
icon_state = "latex"
item_state = "lgloves"
- siemens_coefficient = 0.30
+ siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
permeability_coefficient = 0.01
item_color="white"
- cmo
- item_color = "medical" //Exists for washing machines. Is not different from latex gloves in any way.
-
/obj/item/clothing/gloves/botanic_leather
- desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
+ desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
name = "botanist's leather gloves"
icon_state = "leather"
item_state = "ggloves"
- permeability_coefficient = 0.9
- siemens_coefficient = 0.9
+ permeability_coefficient = 0.05
+ siemens_coefficient = 0.50 //thick work gloves