diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index 1a4bb8bb4e3..d49276c390e 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -3,18 +3,25 @@ desc = "Because you really needed another excuse to punch your crewmates." icon_state = "boxing" item_state = "boxing" + 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") /obj/item/clothing/gloves/white name = "white gloves" @@ -22,6 +29,7 @@ icon_state = "latex" item_state = "lgloves" _color="mime" + species_fit = list("Vox") redcoat _color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way. diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 0be3021243d..27d736e0b32 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -6,6 +6,10 @@ 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 @@ -17,7 +21,10 @@ 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() @@ -29,7 +36,10 @@ 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_COLD_PROTECITON_TEMPERATURE heat_protection = HANDS @@ -51,21 +61,30 @@ 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/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/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" @@ -75,28 +94,40 @@ 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/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/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/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. @@ -109,13 +140,19 @@ 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/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. \ No newline at end of file diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 6cc70cc5719..8739856e680 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -1,62 +1,91 @@ -/obj/item/clothing/gloves/captain - desc = "Regal blue gloves, with a nice gold trim. Swanky." - name = "captain's gloves" - icon_state = "captain" - item_state = "egloves" - _color = "captain" - cold_protection = HANDS - min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE - heat_protection = HANDS - max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE - -/obj/item/clothing/gloves/cyborg - desc = "beep boop borp" - name = "cyborg gloves" - icon_state = "black" - item_state = "r_hands" - siemens_coefficient = 1.0 - -/obj/item/clothing/gloves/swat - desc = "These tactical gloves are somewhat fire and impact-resistant." - name = "\improper SWAT Gloves" - icon_state = "black" - item_state = "swat_gl" - siemens_coefficient = 0.6 - permeability_coefficient = 0.05 - - cold_protection = HANDS - min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE - heat_protection = HANDS - max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE - -/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves - desc = "These tactical gloves are somewhat fire and impact resistant." - name = "combat gloves" - icon_state = "black" - item_state = "swat_gl" - siemens_coefficient = 0 - permeability_coefficient = 0.05 - cold_protection = HANDS - min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE - heat_protection = HANDS - max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE - -/obj/item/clothing/gloves/latex - name = "latex gloves" - desc = "Sterile latex gloves." - icon_state = "latex" - item_state = "lgloves" - siemens_coefficient = 0.30 - permeability_coefficient = 0.01 - _color="white" - - cmo - _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." - name = "botanist's leather gloves" - icon_state = "leather" - item_state = "ggloves" - permeability_coefficient = 0.9 - siemens_coefficient = 0.9 +/obj/item/clothing/gloves/captain + desc = "Regal blue gloves, with a nice gold trim. Swanky." + name = "captain's gloves" + icon_state = "captain" + item_state = "egloves" + _color = "captain" + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) +/obj/item/clothing/gloves/cyborg + desc = "beep boop borp" + name = "cyborg gloves" + 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/swat + desc = "These tactical gloves are somewhat fire and impact-resistant." + name = "\improper SWAT Gloves" + icon_state = "black" + item_state = "swat_gl" + siemens_coefficient = 0.6 + permeability_coefficient = 0.05 + + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) +/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves + desc = "These tactical gloves are somewhat fire and impact resistant." + name = "combat gloves" + icon_state = "black" + item_state = "swat_gl" + siemens_coefficient = 0 + permeability_coefficient = 0.05 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECITON_TEMPERATURE + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) +/obj/item/clothing/gloves/latex + name = "latex gloves" + desc = "Sterile latex gloves." + icon_state = "latex" + item_state = "lgloves" + siemens_coefficient = 0.30 + permeability_coefficient = 0.01 + _color="white" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) + cmo + _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." + name = "botanist's leather gloves" + icon_state = "leather" + item_state = "ggloves" + permeability_coefficient = 0.9 + siemens_coefficient = 0.9 + 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' + ) diff --git a/code/modules/clothing/gloves/ninja.dm b/code/modules/clothing/gloves/ninja.dm index e0ff003213e..819bf5d64ba 100644 --- a/code/modules/clothing/gloves/ninja.dm +++ b/code/modules/clothing/gloves/ninja.dm @@ -19,7 +19,10 @@ var/candrain = 0 var/mindrain = 200 var/maxdrain = 400 - + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) /* This runs the gamut of what ninja gloves can do The other option would be a dedicated ninja touch bullshit proc on everything diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 49d9505bce4..1c84e97df5d 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -6,7 +6,10 @@ flags = FPRINT|TABLEPASS|BLOCKHAIR flags_inv = HIDEFACE w_class = 2 - + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) /obj/item/clothing/mask/luchador name = "Luchador Mask" desc = "Worn by robust fighters, flying high to defeat their foes!" diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 402f159f767..25aff648f63 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -7,6 +7,7 @@ w_class = 2 gas_transfer_coefficient = 0.10 permeability_coefficient = 0.50 + species_fit = list("Vox") var/hanging = 0 species_fit = list("Vox", "Vox Armalis") sprite_sheets = list( @@ -25,14 +26,14 @@ src.hanging = !src.hanging gas_transfer_coefficient = 1 //gas is now escaping to the turf and vice versa flags &= ~(MASKCOVERSMOUTH | MASKINTERNALS) - icon_state = "breathdown" + icon_state = "[initial(icon_state)]down" usr << "Your mask is now hanging on your neck." else src.hanging = !src.hanging gas_transfer_coefficient = 0.10 flags |= MASKCOVERSMOUTH | MASKINTERNALS - icon_state = "breath" + icon_state = "[initial(icon_state)]" usr << "You pull the mask up to cover your face." usr.update_inv_wear_mask() @@ -42,3 +43,12 @@ icon_state = "medical" item_state = "medical" permeability_coefficient = 0.01 + species_fit = list("Vox") + +/obj/item/clothing/mask/breath/vox + desc = "A weirdly-shaped breath mask." + name = "vox breath mask" + icon_state = "voxmask" + item_state = "voxmask" + permeability_coefficient = 0.01 + species_restricted = list("Vox") diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 708e0e977fe..1438a0eb179 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -9,7 +9,10 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 siemens_coefficient = 0.9 - + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) //Bane gas mask /obj/item/clothing/mask/banemask @@ -32,18 +35,21 @@ icon_state = "plaguedoctor" item_state = "gas_mask" armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0) + species_fit = list("Vox") /obj/item/clothing/mask/gas/swat name = "\improper SWAT mask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "swat" siemens_coefficient = 0.7 + species_fit = list("Vox") /obj/item/clothing/mask/gas/syndicate name = "syndicate mask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "swat" siemens_coefficient = 0.7 + species_fit = list("Vox") /obj/item/clothing/mask/gas/voice name = "gas mask" @@ -52,6 +58,7 @@ var/voice = "Unknown" var/vchange = 0//This didn't do anything before. It now checks if the mask has special functions/N origin_tech = "syndicate=4" + species_fit = list("Vox") /obj/item/clothing/mask/gas/voice/space_ninja name = "ninja mask" @@ -61,6 +68,7 @@ vchange = 1 unacidable = 1 siemens_coefficient = 0.2 + species_fit = list() /obj/item/clothing/mask/gas/voice/space_ninja/scar name = "ninja mask" @@ -105,19 +113,19 @@ M << "Your Clown Mask has now morphed into [choice], all praise the Honk Mother!" return 1 - /obj/item/clothing/mask/gas/virusclown_hat name = "clown wig and mask" desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." icon_state = "clown" item_state = "clown_hat" - + species_fit = list("Vox") /obj/item/clothing/mask/gas/sexyclown name = "sexy-clown wig and mask" desc = "A feminine clown mask for the dabbling crossdressers or female entertainers." icon_state = "sexyclown" item_state = "sexyclown" + species_fit = list("Vox") /obj/item/clothing/mask/gas/mime name = "mime mask" @@ -131,23 +139,27 @@ desc = "A mask used when acting as a monkey." icon_state = "monkeymask" item_state = "monkeymask" + species_fit = list("Vox") /obj/item/clothing/mask/gas/sexymime name = "sexy mime mask" desc = "A traditional female mime's mask." icon_state = "sexymime" item_state = "sexymime" + species_fit = list("Vox") /obj/item/clothing/mask/gas/death_commando name = "Death Commando Mask" icon_state = "death_commando_mask" item_state = "death_commando_mask" siemens_coefficient = 0.2 + species_fit = list("Vox") /obj/item/clothing/mask/gas/cyborg name = "cyborg visor" desc = "Beep boop" icon_state = "death" + species_fit = list("Vox") /obj/item/clothing/mask/gas/owl_mask name = "owl mask" @@ -167,7 +179,7 @@ icon_state = "officermask" var/cooldown = 0 var/aggressiveness = 2 - + species_fit = list() /obj/item/clothing/mask/gas/sechailer/warden icon_state = "wardenmask" diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 0a580199862..b08bd13e976 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -6,7 +6,10 @@ flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH w_class = 2 gas_transfer_coefficient = 0.90 - + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) /obj/item/clothing/mask/muzzle/gag name = "gag" desc = "Stick this in their mouth to stop the noise." @@ -32,7 +35,10 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0) - + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) /obj/item/clothing/mask/fakemoustache name = "fake moustache" desc = "Warning: moustache is fake." diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 50728d3acf6..f5ce0d793c4 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -4,9 +4,13 @@ icon_state = "magboots0" var/magpulse = 0 species_restricted = null - icon_action_button = "action_blank" action_button_name = "Toggle the magboots" // flags = NOSLIP //disabled by default + icon_action_button = "action_magboots" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/shoes.dmi' + ) attack_self(mob/user) if(magpulse) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 685125cb241..9131797563d 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -9,6 +9,10 @@ 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" @@ -70,6 +74,10 @@ 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!" @@ -125,10 +133,13 @@ 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." icon_state = "roman" item_state = "roman" - species_restricted = null \ No newline at end of file + species_restricted = null diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 0869d85b39e..cff1de94e7b 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -7,6 +7,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) + species_fit = list("Vox") verb/toggle() set name = "Toggle Labcoat Buttons" @@ -69,30 +70,48 @@ desc = "Bluer than the standard model." icon_state = "labcoat_cmo_open" item_state = "labcoat_cmo" + species_fit = list("Vox") /obj/item/clothing/suit/storage/labcoat/mad name = "The Mad's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." icon_state = "labgreen_open" item_state = "labgreen" + species_fit = list("Vox") /obj/item/clothing/suit/storage/labcoat/genetics name = "Geneticist Labcoat" desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." icon_state = "labcoat_gen_open" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/shoes.dmi' + ) /obj/item/clothing/suit/storage/labcoat/chemist name = "Chemist Labcoat" desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." icon_state = "labcoat_chem_open" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/shoes.dmi' + ) /obj/item/clothing/suit/storage/labcoat/virologist name = "Virologist Labcoat" desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder." icon_state = "labcoat_vir_open" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0) + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/shoes.dmi' + ) /obj/item/clothing/suit/storage/labcoat/science name = "Scientist Labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." icon_state = "labcoat_tox_open" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/shoes.dmi' + ) diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 8b3eabcff6a..97f76e7c5f1 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -8,7 +8,9 @@ _color = "ba_suit" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") - + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define. desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"." @@ -18,6 +20,9 @@ _color = "captain" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/cargo @@ -28,6 +33,9 @@ _color = "qm" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/cargotech @@ -38,6 +46,9 @@ _color = "cargo" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/chaplain @@ -48,6 +59,9 @@ _color = "chapblack" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/chef @@ -57,6 +71,9 @@ _color = "chef" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/clown @@ -76,6 +93,9 @@ _color = "hop" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/head_of_personnel_whimsy desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does." @@ -95,6 +115,9 @@ permeability_coefficient = 0.50 flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/internalaffairs @@ -105,6 +128,9 @@ _color = "internalaffairs" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/janitor @@ -115,6 +141,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/lawyer @@ -127,24 +156,36 @@ item_state = "lawyer_black" _color = "lawyer_black" species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/lawyer/female icon_state = "black_suit_fem" item_state = "black_suit_fem" _color = "black_suit_fem" species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/lawyer/red icon_state = "lawyer_red" item_state = "lawyer_red" _color = "lawyer_red" species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/lawyer/blue icon_state = "lawyer_blue" item_state = "lawyer_blue" _color = "lawyer_blue" species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/lawyer/bluesuit name = "Blue Suit" @@ -153,6 +194,9 @@ item_state = "bluesuit" _color = "bluesuit" species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/lawyer/purpsuit name = "Purple Suit" @@ -160,6 +204,9 @@ item_state = "lawyer_purp" _color = "lawyer_purp" species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/lawyer/oldman name = "Old Man's Suit" @@ -168,6 +215,9 @@ item_state = "oldman" _color = "oldman" species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/librarian @@ -178,6 +228,9 @@ _color = "red_suit" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/mime @@ -197,6 +250,9 @@ _color = "miner" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/barber desc = "It's a barber's uniform." diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index ef88d23e310..a0539901c5d 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -8,6 +8,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/atmospheric_technician desc = "It's a jumpsuit worn by atmospheric technicians." @@ -17,6 +20,9 @@ _color = "atmos" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/engineer desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding." @@ -27,6 +33,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/roboticist desc = "It's a slimming black with reinforced seams; great for industrial work." @@ -36,6 +45,9 @@ _color = "robotics" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/mechanic desc = "It's a pair of overalls worn by mechanics." diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index b66b9f4e755..d657dfb7652 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -10,6 +10,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/scientist desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist." @@ -21,6 +24,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/chemist desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it." @@ -32,6 +38,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /* * Medical @@ -46,6 +55,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/geneticist desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." @@ -57,6 +69,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/virologist desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." @@ -68,6 +83,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/nursesuit desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." @@ -79,6 +97,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/nurse desc = "A dress commonly worn by the nursing staff in the medical department." @@ -90,6 +111,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/orderly desc = "A white suit to be worn by orderly people who love orderly things." @@ -101,6 +125,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/medical desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." @@ -112,6 +139,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/medical/blue name = "medical scrubs" @@ -120,6 +150,9 @@ _color = "scrubsblue" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/medical/green name = "medical scrubs" @@ -128,6 +161,9 @@ _color = "scrubsgreen" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) /obj/item/clothing/under/rank/medical/purple name = "medical scrubs" @@ -136,6 +172,9 @@ _color = "scrubspurple" flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) //paramedic /obj/item/clothing/under/rank/medical/paramedic @@ -148,6 +187,9 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10) flags = FPRINT | TABLEPASS | ONESIZEFITSALL species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) @@ -193,4 +235,4 @@ _color = "virologist_new" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS | ONESIZEFITSALL diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/species/vox/mask.dmi index 6f056313037..0495d878e71 100644 Binary files a/icons/mob/species/vox/mask.dmi and b/icons/mob/species/vox/mask.dmi differ diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/species/vox/shoes.dmi new file mode 100644 index 00000000000..8aaf18114b2 Binary files /dev/null and b/icons/mob/species/vox/shoes.dmi differ diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/species/vox/uniform.dmi new file mode 100644 index 00000000000..4dc9382a839 Binary files /dev/null and b/icons/mob/species/vox/uniform.dmi differ