diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index c24d307a01b..45bfdc86367 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -163,6 +163,10 @@ BLIND // can't see anything var/pickpocket = 0 //Master pickpocket? var/clipped = 0 species_restricted = list("exclude","Unathi","Tajaran","Wryn") + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/gloves.dmi' + ) /obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wirecutters)) @@ -303,9 +307,15 @@ BLIND // can't see anything body_parts_covered = FEET slot_flags = SLOT_FEET + permeability_coefficient = 0.50 slowdown = SHOES_SLOWDOWN species_restricted = list("exclude","Unathi","Tajaran","Wryn") + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/shoes.dmi' + ) + /obj/item/proc/negates_gravity() return 0 diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index ee3e0849d80..cbb355ecab9 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -4,22 +4,15 @@ icon_state = "boxing" item_state = "boxing" species_restricted = null - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) /obj/item/clothing/gloves/boxing/green icon_state = "boxinggreen" item_state = "boxinggreen" - species_fit = list("Vox") /obj/item/clothing/gloves/boxing/blue icon_state = "boxingblue" item_state = "boxingblue" - species_fit = list("Vox") /obj/item/clothing/gloves/boxing/yellow icon_state = "boxingyellow" - item_state = "boxingyellow" - species_fit = list("Vox") \ No newline at end of file + item_state = "boxingyellow" \ No newline at end of file diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index f33a56c9a0a..9c364775343 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -6,11 +6,6 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 _color="yellow" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) - power var/next_shock = 0 @@ -25,10 +20,6 @@ item_state = "ygloves" siemens_coefficient = 1 //Set to a default of 1, gets overridden in New() permeability_coefficient = 0.05 - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) _color="yellow" New() @@ -40,10 +31,6 @@ icon_state = "black" item_state = "bgloves" _color="brown" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS @@ -65,37 +52,26 @@ icon_state = "orange" item_state = "orangegloves" _color="orange" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) + /obj/item/clothing/gloves/color/red name = "red gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "red" item_state = "redgloves" _color = "red" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) - + /obj/item/clothing/gloves/color/red/insulated name = "insulated gloves" desc = "These gloves will protect the wearer from electric shock." siemens_coefficient = 0 permeability_coefficient = 0.05 - + /obj/item/clothing/gloves/color/rainbow name = "rainbow gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "rainbow" item_state = "rainbowgloves" _color = "rainbow" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) clown _color = "clown" @@ -105,40 +81,28 @@ icon_state = "blue" item_state = "bluegloves" _color="blue" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) + /obj/item/clothing/gloves/color/purple name = "purple gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "purple" item_state = "purplegloves" _color="purple" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) + /obj/item/clothing/gloves/color/green name = "green gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "green" item_state = "greengloves" _color="green" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) + /obj/item/clothing/gloves/color/grey name = "grey gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "gray" item_state = "graygloves" _color="grey" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) + rd _color = "director" //Exists for washing machines. Is not different from gray gloves in any way. @@ -151,20 +115,14 @@ icon_state = "lightbrown" item_state = "lightbrowngloves" _color="light brown" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) + /obj/item/clothing/gloves/color/brown name = "brown gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "brown" item_state = "browngloves" _color="brown" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi' - ) + cargo _color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way. @@ -177,10 +135,6 @@ permeability_coefficient = 0.01 _color="white" transfer_prints = TRUE - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' - ) /obj/item/clothing/gloves/color/latex/nitrile name = "nitrile gloves" @@ -212,8 +166,4 @@ cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS - max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' - ) \ No newline at end of file + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT \ No newline at end of file diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 70cbced27ac..79871b9afdc 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -15,10 +15,6 @@ icon_state = "black" item_state = "r_hands" siemens_coefficient = 1.0 - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' - ) /obj/item/clothing/gloves/combat desc = "These tactical gloves are somewhat fire and impact resistant." @@ -31,10 +27,6 @@ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' - ) /obj/item/clothing/gloves/botanic_leather desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin." @@ -46,17 +38,10 @@ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' - ) + /obj/item/clothing/gloves/batmangloves desc = "Used for handling all things bat related." name = "batgloves" icon_state = "bmgloves" item_state = "bmgloves" - _color="bmgloves" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' - ) + _color="bmgloves" \ No newline at end of file diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index eac5aa33530..f2a89c662dd 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -3,7 +3,6 @@ icon_state = "black" _color = "black" desc = "A pair of black shoes." - species_fit = list("Vox") cold_protection = FEET min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT @@ -20,8 +19,6 @@ name = "brown shoes" desc = "A pair of brown shoes." icon_state = "brown" - _color = "brown" - species_fit = list("Vox") captain _color = "captain" //Exists for washing machines. Is not different from brown shoes in any way. @@ -72,7 +69,6 @@ icon_state = "white" permeability_coefficient = 0.01 _color = "white" - species_fit = list("Vox") /obj/item/clothing/shoes/leather name = "leather shoes" @@ -90,7 +86,6 @@ name = "orange shoes" icon_state = "orange" _color = "orange" - species_fit = list("Vox") /obj/item/clothing/shoes/orange/attack_self(mob/user as mob) if (src.chained) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 53a322f1eee..7221e0c069e 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -9,17 +9,12 @@ var/list/clothing_choices = list() siemens_coefficient = 0.8 species_restricted = null - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/shoes.dmi' - ) /obj/item/clothing/shoes/mime name = "mime shoes" icon_state = "mime" _color = "mime" - /obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses name = "combat boots" desc = "High speed, low drag combat boots." @@ -55,10 +50,6 @@ flags = NOSLIP slowdown = SHOES_SLOWDOWN+1 species_restricted = null - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/shoes.dmi' - ) /obj/item/clothing/shoes/clown_shoes desc = "The prankster's standard-issue clowning shoes. Damn they're huge!" @@ -83,6 +74,7 @@ name = "jacksandals" desc = "Nanotrasen-issue Security combat sandals for combat scenarios. They're jacksandals, however that works." icon_state = "jacksandal" + _color = "jacksandal" species_restricted = null /obj/item/clothing/shoes/cult @@ -121,10 +113,7 @@ name = "laceup shoes" desc = "The height of fashion, and they're pre-polished!" icon_state = "laceups" - species_fit = list("Vox") - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/shoes.dmi' - ) + /obj/item/clothing/shoes/roman name = "roman sandals" desc = "Sandals with buckled leather straps on it." diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 7f27823e9a6..ca38284b11c 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/species/vox/gloves.dmi b/icons/mob/species/vox/gloves.dmi index c3d1b6a5603..c12466ee543 100644 Binary files a/icons/mob/species/vox/gloves.dmi and b/icons/mob/species/vox/gloves.dmi differ diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/species/vox/shoes.dmi index 8aaf18114b2..76984ed3ffc 100644 Binary files a/icons/mob/species/vox/shoes.dmi and b/icons/mob/species/vox/shoes.dmi differ