From 6648d3131f3cccb237e6de7ae69c02d86bf81eb4 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Tue, 24 Aug 2021 18:37:48 +0100 Subject: [PATCH] Clothing Organisation V1 --- code/datums/datacore.dm | 220 ++++---- code/game/gamemodes/cult/cult_items.dm | 14 +- .../objects/items/devices/radio/headset.dm | 4 +- code/game/objects/items/trash.dm | 6 +- code/game/objects/items/weapons/cigs.dm | 10 +- code/game/objects/items/weapons/defib.dm | 2 +- .../objects/items/weapons/storage/backpack.dm | 6 +- .../objects/items/weapons/tanks/tank_types.dm | 4 +- code/modules/clothing/chameleon.dm | 24 +- code/modules/clothing/clothing.dm | 22 +- code/modules/clothing/glasses/glasses.dm | 100 ++-- code/modules/clothing/glasses/hud.dm | 50 +- code/modules/clothing/head/beanie.dm | 2 +- code/modules/clothing/head/collectable.dm | 10 +- code/modules/clothing/head/hardhat.dm | 4 +- code/modules/clothing/head/helmet.dm | 8 +- code/modules/clothing/head/jobs.dm | 4 +- code/modules/clothing/head/misc.dm | 20 +- code/modules/clothing/head/misc_special.dm | 30 +- code/modules/clothing/head/soft_caps.dm | 2 +- code/modules/clothing/masks/boxing.dm | 24 +- code/modules/clothing/masks/breath.dm | 16 +- code/modules/clothing/masks/gasmask.dm | 26 +- code/modules/clothing/masks/miscellaneous.dm | 64 +-- code/modules/clothing/patreon/glasses.dm | 2 +- code/modules/clothing/patreon/hats.dm | 8 +- code/modules/clothing/spacesuits/alien.dm | 26 +- code/modules/clothing/spacesuits/ert.dm | 26 +- code/modules/clothing/spacesuits/hardsuit.dm | 26 +- .../clothing/spacesuits/miscellaneous.dm | 64 +-- code/modules/clothing/spacesuits/plasmamen.dm | 2 +- code/modules/clothing/spacesuits/syndi.dm | 18 +- code/modules/clothing/spacesuits/void.dm | 18 +- code/modules/clothing/suits/alien.dm | 2 +- code/modules/clothing/suits/armor.dm | 4 +- code/modules/clothing/suits/bio.dm | 24 +- code/modules/clothing/suits/jobs.dm | 32 +- code/modules/clothing/suits/labcoat.dm | 4 +- code/modules/clothing/suits/miscellaneous.dm | 40 +- code/modules/clothing/suits/utility.dm | 16 +- code/modules/clothing/suits/wiz_robe.dm | 12 +- .../clothing/under/accessories/accessory.dm | 26 +- .../clothing/under/accessories/storage.dm | 2 +- code/modules/clothing/under/color.dm | 2 +- .../under/jobs/plasmamen/_plasmamen.dm | 2 +- code/modules/clothing/under/jobs/security.dm | 2 +- code/modules/customitems/item_defines.dm | 10 +- .../modules/mining/equipment/explorer_gear.dm | 18 +- .../mob/living/carbon/human/update_icons.dm | 32 +- .../mob/new_player/preferences_setup.dm | 486 +++++++++--------- .../sprite_accessories/sprite_accessories.dm | 16 +- code/modules/ninja/suit/mask.dm | 8 +- code/modules/projectiles/guns/alien.dm | 2 +- icons/mob/{ => clothing}/back.dmi | Bin icons/mob/{ => clothing}/belt.dmi | Bin icons/mob/{ => clothing}/belt_mirror.dmi | Bin icons/mob/{ => clothing}/collar.dmi | Bin icons/mob/{ => clothing}/ears.dmi | Bin icons/mob/{ => clothing}/eyes.dmi | Bin icons/mob/{ => clothing}/feet.dmi | Bin icons/mob/{ => clothing}/hands.dmi | Bin icons/mob/{ => clothing}/head.dmi | Bin icons/mob/{ => clothing}/mask.dmi | Bin .../{ => clothing}/species/armalis/back.dmi | Bin .../{ => clothing}/species/armalis/belt.dmi | Bin .../{ => clothing}/species/armalis/ears.dmi | Bin .../{ => clothing}/species/armalis/feet.dmi | Bin .../{ => clothing}/species/armalis/gloves.dmi | Bin .../{ => clothing}/species/armalis/head.dmi | Bin .../{ => clothing}/species/armalis/held.dmi | Bin .../{ => clothing}/species/armalis/mask.dmi | Bin .../{ => clothing}/species/armalis/suit.dmi | Bin .../mob/{ => clothing}/species/drask/eyes.dmi | Bin .../{ => clothing}/species/drask/gloves.dmi | Bin .../mob/{ => clothing}/species/drask/head.dmi | Bin .../{ => clothing}/species/drask/helmet.dmi | Bin .../mob/{ => clothing}/species/drask/mask.dmi | Bin .../{ => clothing}/species/drask/shoes.dmi | Bin .../mob/{ => clothing}/species/drask/suit.dmi | Bin .../{ => clothing}/species/drask/uniform.dmi | Bin .../mob/{ => clothing}/species/grey/back.dmi | Bin .../mob/{ => clothing}/species/grey/eyes.dmi | Bin .../mob/{ => clothing}/species/grey/head.dmi | Bin .../{ => clothing}/species/grey/helmet.dmi | Bin .../mob/{ => clothing}/species/grey/mask.dmi | Bin .../mob/{ => clothing}/species/grey/suit.dmi | Bin .../{ => clothing}/species/grey/underwear.dmi | Bin .../{ => clothing}/species/grey/uniform.dmi | Bin .../mob/{ => clothing}/species/kidan/head.dmi | Bin .../species/plasmaman/helmet.dmi | Bin .../{ => clothing}/species/plasmaman/mask.dmi | Bin .../species/plasmaman/uniform.dmi | Bin .../{ => clothing}/species/skrell/head.dmi | Bin .../{ => clothing}/species/skrell/held.dmi | Bin .../{ => clothing}/species/skrell/helmet.dmi | Bin .../{ => clothing}/species/skrell/suit.dmi | Bin .../{ => clothing}/species/tajaran/head.dmi | Bin .../{ => clothing}/species/tajaran/helmet.dmi | Bin .../{ => clothing}/species/tajaran/mask.dmi | Bin .../{ => clothing}/species/tajaran/suit.dmi | Bin .../{ => clothing}/species/unathi/feet.dmi | Bin .../{ => clothing}/species/unathi/gloves.dmi | Bin .../{ => clothing}/species/unathi/head.dmi | Bin .../{ => clothing}/species/unathi/helmet.dmi | Bin .../{ => clothing}/species/unathi/mask.dmi | Bin .../{ => clothing}/species/unathi/suit.dmi | Bin icons/mob/{ => clothing}/species/vox/back.dmi | Bin .../mob/{ => clothing}/species/vox/collar.dmi | Bin icons/mob/{ => clothing}/species/vox/ears.dmi | Bin icons/mob/{ => clothing}/species/vox/eyes.dmi | Bin icons/mob/{ => clothing}/species/vox/feet.dmi | Bin .../mob/{ => clothing}/species/vox/gloves.dmi | Bin icons/mob/{ => clothing}/species/vox/head.dmi | Bin .../mob/{ => clothing}/species/vox/helmet.dmi | Bin icons/mob/{ => clothing}/species/vox/mask.dmi | Bin .../mob/{ => clothing}/species/vox/shoes.dmi | Bin icons/mob/{ => clothing}/species/vox/suit.dmi | Bin .../{ => clothing}/species/vox/underwear.dmi | Bin .../{ => clothing}/species/vox/uniform.dmi | Bin .../{ => clothing}/species/vulpkanin/head.dmi | Bin .../species/vulpkanin/helmet.dmi | Bin .../{ => clothing}/species/vulpkanin/mask.dmi | Bin .../{ => clothing}/species/vulpkanin/suit.dmi | Bin icons/mob/{ => clothing}/suit.dmi | Bin icons/mob/{ => clothing}/underwear.dmi | Bin icons/mob/{ => clothing}/uniform.dmi | Bin icons/mob/species/drask/gloves1.dmi | Bin 18365 -> 0 bytes 127 files changed, 801 insertions(+), 801 deletions(-) rename icons/mob/{ => clothing}/back.dmi (100%) rename icons/mob/{ => clothing}/belt.dmi (100%) rename icons/mob/{ => clothing}/belt_mirror.dmi (100%) rename icons/mob/{ => clothing}/collar.dmi (100%) rename icons/mob/{ => clothing}/ears.dmi (100%) rename icons/mob/{ => clothing}/eyes.dmi (100%) rename icons/mob/{ => clothing}/feet.dmi (100%) rename icons/mob/{ => clothing}/hands.dmi (100%) rename icons/mob/{ => clothing}/head.dmi (100%) rename icons/mob/{ => clothing}/mask.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/back.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/belt.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/ears.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/feet.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/gloves.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/head.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/held.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/mask.dmi (100%) rename icons/mob/{ => clothing}/species/armalis/suit.dmi (100%) rename icons/mob/{ => clothing}/species/drask/eyes.dmi (100%) rename icons/mob/{ => clothing}/species/drask/gloves.dmi (100%) rename icons/mob/{ => clothing}/species/drask/head.dmi (100%) rename icons/mob/{ => clothing}/species/drask/helmet.dmi (100%) rename icons/mob/{ => clothing}/species/drask/mask.dmi (100%) rename icons/mob/{ => clothing}/species/drask/shoes.dmi (100%) rename icons/mob/{ => clothing}/species/drask/suit.dmi (100%) rename icons/mob/{ => clothing}/species/drask/uniform.dmi (100%) rename icons/mob/{ => clothing}/species/grey/back.dmi (100%) rename icons/mob/{ => clothing}/species/grey/eyes.dmi (100%) rename icons/mob/{ => clothing}/species/grey/head.dmi (100%) rename icons/mob/{ => clothing}/species/grey/helmet.dmi (100%) rename icons/mob/{ => clothing}/species/grey/mask.dmi (100%) rename icons/mob/{ => clothing}/species/grey/suit.dmi (100%) rename icons/mob/{ => clothing}/species/grey/underwear.dmi (100%) rename icons/mob/{ => clothing}/species/grey/uniform.dmi (100%) rename icons/mob/{ => clothing}/species/kidan/head.dmi (100%) rename icons/mob/{ => clothing}/species/plasmaman/helmet.dmi (100%) rename icons/mob/{ => clothing}/species/plasmaman/mask.dmi (100%) rename icons/mob/{ => clothing}/species/plasmaman/uniform.dmi (100%) rename icons/mob/{ => clothing}/species/skrell/head.dmi (100%) rename icons/mob/{ => clothing}/species/skrell/held.dmi (100%) rename icons/mob/{ => clothing}/species/skrell/helmet.dmi (100%) rename icons/mob/{ => clothing}/species/skrell/suit.dmi (100%) rename icons/mob/{ => clothing}/species/tajaran/head.dmi (100%) rename icons/mob/{ => clothing}/species/tajaran/helmet.dmi (100%) rename icons/mob/{ => clothing}/species/tajaran/mask.dmi (100%) rename icons/mob/{ => clothing}/species/tajaran/suit.dmi (100%) rename icons/mob/{ => clothing}/species/unathi/feet.dmi (100%) rename icons/mob/{ => clothing}/species/unathi/gloves.dmi (100%) rename icons/mob/{ => clothing}/species/unathi/head.dmi (100%) rename icons/mob/{ => clothing}/species/unathi/helmet.dmi (100%) rename icons/mob/{ => clothing}/species/unathi/mask.dmi (100%) rename icons/mob/{ => clothing}/species/unathi/suit.dmi (100%) rename icons/mob/{ => clothing}/species/vox/back.dmi (100%) rename icons/mob/{ => clothing}/species/vox/collar.dmi (100%) rename icons/mob/{ => clothing}/species/vox/ears.dmi (100%) rename icons/mob/{ => clothing}/species/vox/eyes.dmi (100%) rename icons/mob/{ => clothing}/species/vox/feet.dmi (100%) rename icons/mob/{ => clothing}/species/vox/gloves.dmi (100%) rename icons/mob/{ => clothing}/species/vox/head.dmi (100%) rename icons/mob/{ => clothing}/species/vox/helmet.dmi (100%) rename icons/mob/{ => clothing}/species/vox/mask.dmi (100%) rename icons/mob/{ => clothing}/species/vox/shoes.dmi (100%) rename icons/mob/{ => clothing}/species/vox/suit.dmi (100%) rename icons/mob/{ => clothing}/species/vox/underwear.dmi (100%) rename icons/mob/{ => clothing}/species/vox/uniform.dmi (100%) rename icons/mob/{ => clothing}/species/vulpkanin/head.dmi (100%) rename icons/mob/{ => clothing}/species/vulpkanin/helmet.dmi (100%) rename icons/mob/{ => clothing}/species/vulpkanin/mask.dmi (100%) rename icons/mob/{ => clothing}/species/vulpkanin/suit.dmi (100%) rename icons/mob/{ => clothing}/suit.dmi (100%) rename icons/mob/{ => clothing}/underwear.dmi (100%) rename icons/mob/{ => clothing}/uniform.dmi (100%) delete mode 100644 icons/mob/species/drask/gloves1.dmi diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index a79eb2105ae..87aabb95445 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -356,159 +356,159 @@ GLOBAL_VAR_INIT(record_id_num, 1001) job_clothes = H.mind.assigned_role switch(job_clothes) if("Head of Personnel") - clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hop_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Nanotrasen Representative") - clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) if("Blueshield") - clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "blueshield"), ICON_OVERLAY) if("Magistrate") - clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "really_black_suit_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_OVERLAY) if("Bartender") - clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "ba_suit_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Botanist") - clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hydroponics_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Chef") - clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chef_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Janitor") - clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "janitor_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Librarian") - clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "red_suit_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Barber") - clothes_s = new /icon('icons/mob/uniform.dmi', "barber_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "barber_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Clown") - clothes_s = new /icon('icons/mob/uniform.dmi', "clown_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "clown_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "clown"), ICON_UNDERLAY) if("Mime") - clothes_s = new /icon('icons/mob/uniform.dmi', "mime_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "mime_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Quartermaster") - clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "qm_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Cargo Technician") - clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "cargotech_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Shaft Miner") - clothes_s = new /icon('icons/mob/uniform.dmi', "explorer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "explorer"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "explorer_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY) if("Lawyer") - clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "internalaffairs_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Chaplain") - clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chapblack_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Research Director") - clothes_s = new /icon('icons/mob/uniform.dmi', "director_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "director_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if("Scientist") - clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "toxinswhite_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) if("Chemist") - clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chemistrywhite_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY) if("Chief Medical Officer") - clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "cmo_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY) if("Medical Doctor") - clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if("Coroner") - clothes_s = new /icon('icons/mob/uniform.dmi', "scrubsblack_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_mort_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "scrubsblack_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_mort_open"), ICON_OVERLAY) if("Geneticist") - clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "geneticswhite_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY) if("Virologist") - clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "virologywhite_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) if("Psychiatrist") - clothes_s = new /icon('icons/mob/uniform.dmi', "psych_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "psych_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_UNDERLAY) if("Paramedic") - clothes_s = new /icon('icons/mob/uniform.dmi', "paramedic_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "paramedic_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Captain") - clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "captain_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Head of Security") - clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hosred_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Warden") - clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "warden_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Detective") - clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "detective_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY) if("Security Pod Pilot") - clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bomber"), ICON_OVERLAY) if("Brig Physician") - clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) if("Security Officer") - clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Chief Engineer") - clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chief_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Station Engineer") - clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "engine_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Life Support Specialist") - clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "atmos_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Mechanic") - clothes_s = new /icon('icons/mob/uniform.dmi', "mechanic_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "mechanic_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Roboticist") - clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "robotics_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if("Syndicate Agent") - clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Syndicate Officer") - clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY) if("Syndicate Nuclear Operative") - clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY) else if(H.mind && (H.mind.assigned_role in get_all_centcom_jobs())) - clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) else - clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "grey_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) preview_icon.Blend(face_s, ICON_OVERLAY) // Why do we do this twice if(clothes_s) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 4b43c992347..9b890787d7f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -23,7 +23,7 @@ sharp = TRUE hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sprite_sheets_inhand = list("Skrell" = 'icons/mob/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head + sprite_sheets_inhand = list("Skrell" = 'icons/mob/clothing/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head /obj/item/melee/cultblade/New() if(SSticker.mode) @@ -187,9 +187,9 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS armor = list("melee" = -50, "bullet" = -50, "laser" = -50,"energy" = -50, "bomb" = -50, "bio" = -50, "rad" = -50, "fire" = 0, "acid" = 0) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) hoodtype = /obj/item/clothing/head/hooded/flagellant_hood @@ -220,9 +220,9 @@ flags_cover = HEADCOVERSEYES armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/whetstone/cult diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 79f49b39c94..03d89af52af 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -5,8 +5,8 @@ icon_state = "headset" item_state = "headset" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/ears.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/ears.dmi' + "Vox" = 'icons/mob/clothing/species/vox/ears.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi' ) //We read you loud and skree-er. materials = list(MAT_METAL=75) canhear_range = 0 // can't hear headsets from very far away diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index c2ff3879968..051e936ea9c 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -67,9 +67,9 @@ slot_flags = SLOT_HEAD dog_fashion = /datum/dog_fashion/head/fried_vox_empty sprite_sheets = list( - "Skrell" = 'icons/mob/species/skrell/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Kidan" = 'icons/mob/species/kidan/head.dmi' + "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi' ) /obj/item/trash/pistachios diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 5d3ca5fc919..cf19a910647 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -33,11 +33,11 @@ LIGHTERS ARE IN LIGHTERS.DM var/list/list_reagents = list("nicotine" = 40) var/first_puff = TRUE // the first puff is a bit more reagents ingested sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi') + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi') /obj/item/clothing/mask/cigarette/New() diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 6f2f6e1ff0f..e76207ae85c 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -13,7 +13,7 @@ actions_types = list(/datum/action/item_action/toggle_paddles) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/back.dmi' + "Vox" = 'icons/mob/clothing/species/vox/back.dmi' ) var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index f5a47c31b0a..cd0997481b6 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -18,9 +18,9 @@ resistance_flags = NONE max_integrity = 300 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/back.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/back.dmi', - "Grey" = 'icons/mob/species/grey/back.dmi' + "Vox" = 'icons/mob/clothing/species/vox/back.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/back.dmi', + "Grey" = 'icons/mob/clothing/species/grey/back.dmi' ) //For Armalis anything but this and the nitrogen tank will use the default backpack icon. /obj/item/storage/backpack/attackby(obj/item/W as obj, mob/user as mob, params) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 2964c960501..825bc70699e 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -170,7 +170,7 @@ name = "nitrogen tank" desc = "A tank of nitrogen." icon_state = "oxygen_fr" - sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/back.dmi') //Do it for Big Bird. + sprite_sheets = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/back.dmi') //Do it for Big Bird. distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE /obj/item/tank/internals/nitrogen/populate_gas() @@ -188,7 +188,7 @@ name = "vox specialized nitrogen tank" desc = "A high-tech nitrogen tank designed specifically for Vox." icon_state = "emergency_vox" - sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird. + sprite_sheets = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/belt.dmi') //Do it for Big Bird. volume = 35 /obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas() diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 5e872075da7..c873c76e1a5 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -232,7 +232,7 @@ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) var/datum/action/item_action/chameleon/change/chameleon_action @@ -267,9 +267,9 @@ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) var/datum/action/item_action/chameleon/change/chameleon_action @@ -367,7 +367,7 @@ armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) var/datum/action/item_action/chameleon/change/chameleon_action @@ -406,12 +406,12 @@ flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi' ) var/obj/item/voice_changer/voice_changer @@ -484,7 +484,7 @@ name = "backpack" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/back.dmi' + "Vox" = 'icons/mob/clothing/species/vox/back.dmi' ) var/datum/action/item_action/chameleon/change/chameleon_action diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index e42c616f12e..cc5710d14d6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -134,8 +134,8 @@ slot_flags = SLOT_EARS resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/ears.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/ears.dmi' + "Vox" = 'icons/mob/clothing/species/vox/ears.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi' ) //We read you loud and skree-er. /obj/item/clothing/ears/attack_hand(mob/user) @@ -262,8 +262,8 @@ BLIND // can't see anything put_on_delay = 40 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi', - "Drask" = 'icons/mob/species/drask/gloves.dmi' + "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi', + "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi' ) // Called just before an attack_hand(), in mob/UnarmedAttack() @@ -447,8 +447,8 @@ BLIND // can't see anything slowdown = SHOES_SLOWDOWN sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/shoes.dmi', - "Drask" = 'icons/mob/species/drask/shoes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/shoes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/shoes.dmi' ) /obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params) @@ -617,7 +617,7 @@ BLIND // can't see anything hide_tail_by_species = null species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Under clothing @@ -633,9 +633,9 @@ BLIND // can't see anything pickup_sound = 'sound/items/handling/cloth_pickup.ogg' sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi', - "Drask" = 'icons/mob/species/drask/uniform.dmi', - "Grey" = 'icons/mob/species/grey/uniform.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi', + "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi', + "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi' ) var/has_sensor = TRUE//For the crew computer 2 = unable to change mode @@ -728,7 +728,7 @@ BLIND // can't see anything if(!usr.incapacitated()) if(copytext(item_color,-2) != "_d") basecolor = item_color - if((basecolor + "_d_s") in icon_states('icons/mob/uniform.dmi')) + if((basecolor + "_d_s") in icon_states('icons/mob/clothing/uniform.dmi')) item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]" usr.update_inv_w_uniform() else diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index af979eb1045..00dcd32547e 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -71,10 +71,10 @@ prescription_upgradable = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/meson/night @@ -121,9 +121,9 @@ resistance_flags = ACID_PROOF armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) actions_types = list(/datum/action/item_action/toggle_research_scanner) @@ -147,7 +147,7 @@ item_state = "glasses" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) /obj/item/clothing/glasses/night @@ -160,9 +160,9 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/eyepatch @@ -172,9 +172,9 @@ item_state = "eyepatch" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/monocle @@ -185,9 +185,9 @@ prescription_upgradable = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/material @@ -199,9 +199,9 @@ vision_flags = SEE_OBJS sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/material/cyber @@ -229,9 +229,9 @@ prescription = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/regular/hipster @@ -247,9 +247,9 @@ item_state = "3d" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/gglasses @@ -259,9 +259,9 @@ item_state = "gglasses" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) prescription_upgradable = 1 @@ -276,9 +276,9 @@ prescription_upgradable = 1 dog_fashion = /datum/dog_fashion/head sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/sunglasses_fake @@ -290,9 +290,9 @@ flash_protect = 0 tint = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/sunglasses/noir @@ -344,9 +344,9 @@ tint = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/sunglasses/lasers @@ -370,9 +370,9 @@ tint = 2 visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/welding/attack_self(mob/user) @@ -420,9 +420,9 @@ flash_protect = -1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/thermal/emp_act(severity) @@ -469,9 +469,9 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE resistance_flags = LAVA_PROOF | FIRE_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params) @@ -499,9 +499,9 @@ tint = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/tajblind/eng diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 9f4b4f4c834..2a03c6f0a60 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -36,9 +36,9 @@ examine_extensions = list(EXAMINE_HUD_MEDICAL) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/hud/health/night @@ -67,9 +67,9 @@ HUDType = DATA_HUD_DIAGNOSTIC sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/hud/diagnostic/night @@ -100,9 +100,9 @@ examine_extensions = list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) @@ -137,9 +137,9 @@ prescription_upgradable = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/hud/security/sunglasses/prescription @@ -152,9 +152,9 @@ HUDType = DATA_HUD_HYDROPONIC sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/hud/hydroponic/night @@ -177,7 +177,7 @@ up = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) /obj/item/clothing/glasses/hud/security/tajblind/attack_self() @@ -193,9 +193,9 @@ up = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/hud/health/tajblind/attack_self() @@ -209,9 +209,9 @@ HUDType = DATA_HUD_SECURITY_BASIC examine_extensions = list(EXAMINE_HUD_SKILLS) sprite_sheets = list( - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) /obj/item/clothing/glasses/hud/skills/sunglasses @@ -223,7 +223,7 @@ tint = 1 prescription_upgradable = TRUE sprite_sheets = list( - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm index 5e6ce69f252..61767d23fe0 100644 --- a/code/modules/clothing/head/beanie.dm +++ b/code/modules/clothing/head/beanie.dm @@ -9,7 +9,7 @@ icon_state = "beanie" //Default white item_color = "beanie" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', ) /obj/item/clothing/head/beanie/black diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 501ec562441..86ddd8e6eca 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -66,10 +66,10 @@ item_state = "welding" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi' ) /obj/item/clothing/head/collectable/slime @@ -142,5 +142,5 @@ item_state = "swat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi' ) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 95c4e04b3ac..e8a5a608559 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -13,7 +13,7 @@ resistance_flags = FIRE_PROOF dog_fashion = /datum/dog_fashion/head/hardhat sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/hardhat/attack_self(mob/living/user) @@ -97,5 +97,5 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = null sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e8ce88dba1e..552f0677827 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -15,9 +15,9 @@ strip_delay = 60 dog_fashion = /datum/dog_fashion/head/helmet sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Drask" = 'icons/mob/species/drask/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) /obj/item/clothing/head/helmet/attack_self(mob/user) @@ -224,7 +224,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi' ) /obj/item/clothing/head/helmet/riot/knight/blue diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 728884e263f..e7e6d98b5b9 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -82,7 +82,7 @@ dog_fashion = /datum/dog_fashion/head/detective sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) //Mime @@ -176,7 +176,7 @@ icon_state = "surgcap_blue" flags = BLOCKHEADHAIR sprite_sheets = list( - "Drask" = 'icons/mob/species/drask/head.dmi' + "Drask" = 'icons/mob/clothing/species/drask/head.dmi' ) /obj/item/clothing/head/surgery/purple diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 388fa0374ed..85d6080f642 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -81,7 +81,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) @@ -95,7 +95,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/snowman @@ -108,7 +108,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/that @@ -273,7 +273,7 @@ flags = BLOCKHAIR sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/corgi @@ -313,7 +313,7 @@ icon_state = "fedora" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/fedora/whitefedora @@ -321,7 +321,7 @@ icon_state = "wfedora" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/fedora/brownfedora @@ -329,7 +329,7 @@ icon_state = "bfedora" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/stalhelm //Why do these exist @@ -436,7 +436,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) actions_types = list(/datum/action/item_action/caw) @@ -469,7 +469,7 @@ flags_inv = HIDEFACE|HIDEEARS sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/papersack/smiley @@ -480,7 +480,7 @@ flags_inv = HIDEFACE|HIDEEARS sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/crown diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 28dd6f4cb55..807d7630987 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -28,11 +28,11 @@ resistance_flags = FIRE_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) /obj/item/clothing/head/welding/attack_self(mob/user) @@ -141,7 +141,7 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = /datum/dog_fashion/head/ushanka sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) @@ -169,7 +169,7 @@ sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) @@ -202,10 +202,10 @@ if(!istype(user)) return var/obj/item/organ/external/head/head_organ = user.get_organ("head") - mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty") + mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kitty") mob.Blend(head_organ.hair_colour, ICON_ADD) - var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner") + var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kittyinner") mob.Blend(earbit, ICON_OVERLAY) icon_override = mob @@ -224,10 +224,10 @@ /obj/item/clothing/head/kitty/mouse/update_icon(mob/living/carbon/human/user) if(!istype(user)) return var/obj/item/organ/external/head/head_organ = user.get_organ("head") - mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mousey") + mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mousey") mob.Blend(head_organ.hair_colour, ICON_ADD) - var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mouseyinner") + var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mouseyinner") mob.Blend(earbit, ICON_OVERLAY) icon_override = mob @@ -242,7 +242,7 @@ species_disguise = "High-tech robot" dog_fashion = /datum/dog_fashion/head/cardborg sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) @@ -268,8 +268,8 @@ item_state = "head_mirror" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index f55be1d578e..774b560a858 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -8,7 +8,7 @@ actions_types = list(/datum/action/item_action/flip_cap) dog_fashion = /datum/dog_fashion/head/cargo_tech sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/soft/dropped() diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 090011ce47d..ce9e2756cef 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -10,12 +10,12 @@ adjusted_flags = SLOT_HEAD sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/balaclava/attack_self(mob/user) @@ -31,12 +31,12 @@ w_class = WEIGHT_CLASS_SMALL sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/luchador/tecnicos diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 28a0dad852d..895b0214f71 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -11,14 +11,14 @@ actions_types = list(/datum/action/item_action/adjust) resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Plasmaman" = 'icons/mob/species/plasmaman/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi', + "Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi' ) /obj/item/clothing/mask/breath/attack_self(mob/user) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index d8cba5290b7..14dd7f3653e 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -11,13 +11,13 @@ permeability_coefficient = 0.01 resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Plasmaman" = 'icons/mob/species/plasmaman/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi' ) // **** Welding gas mask **** @@ -50,12 +50,12 @@ resistance_flags = FIRE_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi' ) /obj/item/clothing/mask/gas/explorer/marines diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index e663856e3c5..ece319c7a1a 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -13,7 +13,7 @@ var/locked = FALSE //Indicates if a mask is locked, should always start as 0. sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi' ) // Clumsy folks can't take the mask off themselves. @@ -91,11 +91,11 @@ flags = DROPDEL sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi' ) /obj/item/clothing/mask/muzzle/tapegag/dropped(mob/user) @@ -119,12 +119,12 @@ materials = list(MAT_METAL=500, MAT_GLASS=50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/muzzle/safety/shock @@ -216,12 +216,12 @@ actions_types = list(/datum/action/item_action/adjust) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) @@ -237,12 +237,12 @@ dog_fashion = /datum/dog_fashion/head/not_ian sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/fakemoustache/attack_self(mob/user) @@ -318,8 +318,8 @@ var/originalname = "" sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/horsehead/equipped(mob/user, slot) @@ -427,12 +427,12 @@ icon_state = "bandbotany" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) actions_types = list(/datum/action/item_action/adjust) diff --git a/code/modules/clothing/patreon/glasses.dm b/code/modules/clothing/patreon/glasses.dm index 08d5d6b0af8..88b8216338f 100644 --- a/code/modules/clothing/patreon/glasses.dm +++ b/code/modules/clothing/patreon/glasses.dm @@ -9,7 +9,7 @@ item_state = "gar" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/patreon/hats.dm b/code/modules/clothing/patreon/hats.dm index 8b769ba4150..6c34a2576c5 100644 --- a/code/modules/clothing/patreon/hats.dm +++ b/code/modules/clothing/patreon/hats.dm @@ -11,7 +11,7 @@ flags = BLOCKHAIR sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) //gold top hat and recolours @@ -22,7 +22,7 @@ item_state = "goldtophat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) @@ -47,7 +47,7 @@ flags = BLOCKHAIR sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) //black sombrero @@ -59,5 +59,5 @@ flags = BLOCKHAIR sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index e546d67f485..f5e75dd2b9f 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -34,7 +34,7 @@ icon = 'icons/obj/clothing/species/unathi/hats.dmi' species_restricted = list("Unathi") sprite_sheets = list( - "Unathi" = 'icons/mob/species/unathi/helmet.dmi' + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi' ) /obj/item/clothing/head/helmet/space/unathi/helmet_cheap @@ -48,7 +48,7 @@ icon = 'icons/obj/clothing/species/unathi/suits.dmi' species_restricted = list("Unathi") sprite_sheets = list( - "Unathi" = 'icons/mob/species/unathi/suit.dmi' + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi' ) /obj/item/clothing/suit/space/unathi/rig_cheap @@ -82,8 +82,8 @@ icon = 'icons/obj/clothing/species/vox/suits.dmi' species_restricted = list("Vox", "Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi', ) /obj/item/clothing/head/helmet/space/vox @@ -93,8 +93,8 @@ icon = 'icons/obj/clothing/species/vox/hats.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/head.dmi', ) /obj/item/clothing/head/helmet/space/vox/pressure @@ -151,7 +151,7 @@ icon = 'icons/obj/clothing/species/vox/uniforms.dmi' species_restricted = list("Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi' ) /obj/item/clothing/under/vox/vox_casual @@ -170,8 +170,8 @@ item_state = "vox-casual-2" species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi' ) /obj/item/clothing/gloves/color/yellow/vox @@ -185,8 +185,8 @@ icon = 'icons/obj/clothing/species/vox/gloves.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/gloves.dmi', + "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/gloves.dmi', ) /obj/item/clothing/shoes/magboots/vox @@ -197,8 +197,8 @@ icon = 'icons/obj/clothing/species/vox/shoes.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/feet.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/feet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/feet.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/feet.dmi' ) /obj/item/clothing/shoes/magboots/vox/attack_self(mob/user) diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index b8c4c7e86f0..571785f46a0 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -12,8 +12,8 @@ strip_delay = 130 sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi' ) /obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize() @@ -59,8 +59,8 @@ strip_delay = 130 resistance_flags = FIRE_PROOF sprite_sheets = list( - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Commander @@ -206,11 +206,11 @@ resistance_flags = FIRE_PROOF has_camera = FALSE sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi' ) /obj/item/clothing/suit/space/hardsuit/ert/paranormal @@ -221,10 +221,10 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal resistance_flags = FIRE_PROOF sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi' + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi' ) hide_tail_by_species = list("Unathi, Tajaran, Vox, Vulpkanin") diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index e4a5b029328..58514aa5a59 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -23,13 +23,13 @@ //Species-specific stuff. species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Skrell" = 'icons/mob/species/skrell/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Drask" = 'icons/mob/species/drask/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) sprite_sheets_obj = list( "Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi', @@ -157,12 +157,12 @@ hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran") species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Skrell" = 'icons/mob/species/skrell/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi' + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi' ) sprite_sheets_obj = list( "Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi', diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 226196fbc32..32c192c213e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -10,8 +10,8 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) /obj/item/clothing/head/helmet/space/capspace/equipped(mob/living/carbon/human/user, slot) @@ -34,7 +34,7 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Deathsquad space suit, not hardsuits because no flashlight! @@ -77,7 +77,7 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/head/helmet/space/deathsquad/beret @@ -117,8 +117,8 @@ icon_state = "santahat" sprite_sheets = list( - "Grey" = 'icons/mob/species/Grey/head.dmi', - "Drask" = 'icons/mob/species/Drask/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/Grey/head.dmi', + "Drask" = 'icons/mob/clothing/species/Drask/helmet.dmi' ) flags = BLOCKHAIR | STOPSPRESSUREDMAGE flags_cover = HEADCOVERSEYES @@ -177,13 +177,13 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Skrell" = 'icons/mob/species/skrell/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Drask" = 'icons/mob/species/drask/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', ) sprite_sheets_obj = list( "Vox" = 'icons/obj/clothing/species/vox/hats.dmi' @@ -198,12 +198,12 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Skrell" = 'icons/mob/species/skrell/suit.dmi', - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', ) sprite_sheets_obj = list( "Vox" = 'icons/obj/clothing/species/vox/suits.dmi' @@ -218,10 +218,10 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', ) sprite_sheets_obj = list( "Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi', @@ -240,11 +240,11 @@ flash_protect = 0 species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) sprite_sheets_obj = list( "Vox" = 'icons/obj/clothing/species/vox/hats.dmi', @@ -260,7 +260,7 @@ item_state = "spacemimehelmet" species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi') + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') sprite_sheets_obj = null /obj/item/clothing/suit/space/eva/mime @@ -271,7 +271,7 @@ item_state = "spacemime_items" species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi') + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') sprite_sheets_obj = null /obj/item/clothing/head/helmet/space/eva/clown @@ -282,7 +282,7 @@ item_state = "clownhelmet" species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi') + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') sprite_sheets_obj = null /obj/item/clothing/suit/space/eva/clown @@ -293,5 +293,5 @@ item_state = "spaceclown_items" species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi') + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') sprite_sheets_obj = null diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index e672852858d..df18facbb10 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -22,7 +22,7 @@ visor_flags_inv = HIDEEYES|HIDEFACE icon = 'icons/obj/clothing/species/plasmaman/hats.dmi' species_restricted = list("Plasmaman") - sprite_sheets = list("Plasmaman" = 'icons/mob/species/plasmaman/helmet.dmi') + sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/helmet.dmi') /obj/item/clothing/head/helmet/space/plasmaman/New() ..() diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 52a230fa60b..696428b90ff 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -7,11 +7,11 @@ desc = "Has a tag on it: Totally not property of a hostile corporation, honest!" armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85) sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi') + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') /obj/item/clothing/suit/space/syndicate @@ -23,10 +23,10 @@ allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals) armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85) sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi') + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') //Green syndicate space suit diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm index e279b4697d3..e81482dd340 100644 --- a/code/modules/clothing/spacesuits/void.dm +++ b/code/modules/clothing/spacesuits/void.dm @@ -7,11 +7,11 @@ item_state = "void" flags_inv = HIDEMASK|HIDEEARS sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi') + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') /obj/item/clothing/suit/space/nasavoid name = "NASA Void Suit" @@ -20,10 +20,10 @@ desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance." allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/multitool) sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi') + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') //Colors!!! /obj/item/clothing/head/helmet/space/nasavoid/green diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index 1fde5cd6f84..4021f440433 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -1,7 +1,7 @@ //Unathi clothing. /obj/item/clothing/suit/unathi sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/unathi/robe diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 0a53e5c0abf..b928ff403b5 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -11,7 +11,7 @@ resistance_flags = NONE armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', ) w_class = WEIGHT_CLASS_NORMAL @@ -41,7 +41,7 @@ name = "security armor" desc = "An armored vest that protects against some damage. This one has a clip for a holobadge." sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) icon_state = "armor" item_state = "armor" diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 996ce7e3ad9..448df4cf4e7 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -11,11 +11,11 @@ resistance_flags = ACID_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/head.dmi', - "Tajaran" = 'icons/mob/species/tajaran/head.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/suit/bio_suit @@ -36,10 +36,10 @@ put_on_delay = 70 resistance_flags = ACID_PROOF sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) @@ -103,8 +103,8 @@ put_on_delay = 20 sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', ) hide_tail_by_species = list("Unathi, Tajaran, Vulpkanin") diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index b3fd2c5aa85..ed7c776058f 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -12,7 +12,7 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10, fire = 50, acid = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Brig Physician @@ -27,7 +27,7 @@ armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Botanist @@ -41,7 +41,7 @@ allowed = list(/obj/item/reagent_containers/spray/plantbgone,/obj/item/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator,/obj/item/reagent_containers/spray/pestspray,/obj/item/hatchet,/obj/item/storage/bag/plants) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Captain @@ -55,7 +55,7 @@ allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/captunic/capjacket @@ -67,7 +67,7 @@ flags_inv = HIDEJUMPSUIT sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/mantle/armor/captain @@ -88,7 +88,7 @@ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Chaplain @@ -103,7 +103,7 @@ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Chaplain @@ -143,7 +143,7 @@ allowed = list (/obj/item/kitchen/knife) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Chef @@ -185,7 +185,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Forensics @@ -221,7 +221,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Engineering @@ -235,13 +235,13 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Lawyer /obj/item/clothing/suit/storage/lawyer sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/storage/lawyer/blackjacket @@ -313,7 +313,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/storage/ntrep @@ -328,7 +328,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Medical @@ -346,7 +346,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Mime @@ -358,7 +358,7 @@ blood_overlay_type = "armor" //it's the less thing that I can put here sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/suspenders/nodrop diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index ea0a76b4427..fd0cc650679 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -11,8 +11,8 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) species_exception = list(/datum/species/golem) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6b27515dd93..47b79e2d228 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -21,7 +21,7 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/redtag @@ -36,7 +36,7 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /* @@ -49,7 +49,7 @@ item_state = "pirate_old" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/pirate_black @@ -59,7 +59,7 @@ item_state = "pirate" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/hgpirate @@ -122,7 +122,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/apron/overalls @@ -269,7 +269,7 @@ item_state = "classicponcho" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/poncho/green @@ -373,7 +373,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) - sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/head/hooded/winterhood name = "winter hood" @@ -385,7 +385,7 @@ flags = BLOCKHAIR flags_inv = HIDEEARS - sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') /obj/item/clothing/suit/hooded/wintercoat/captain name = "captain's winter coat" @@ -502,7 +502,7 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen) hoodtype = /obj/item/clothing/head/hooded/hood sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/head/hooded/hood @@ -515,7 +515,7 @@ flags_inv = HIDEEARS sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/hooded/hood/blue @@ -576,7 +576,7 @@ item_state = "ianshirt" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) @@ -626,7 +626,7 @@ item_state = "brtrenchcoat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/blacktrenchcoat @@ -636,7 +636,7 @@ item_state = "bltrenchcoat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //trackjackets @@ -653,7 +653,7 @@ adjust_flavour = "unzip" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/tracksuit/green @@ -786,7 +786,7 @@ adjust_flavour = "unzip" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/jacket/pilot @@ -826,9 +826,9 @@ adjust_flavour = "unzip" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) /obj/item/clothing/suit/jacket/leather/overcoat @@ -848,7 +848,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/soldiercoat @@ -861,7 +861,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/toggle/owlwings diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 6cd8596d8b3..78321ba9733 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -36,7 +36,7 @@ item_state = "firefighter" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/fire/heavy @@ -55,7 +55,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /* @@ -79,8 +79,8 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/suit/bomb_suit @@ -105,7 +105,7 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/head/bomb_hood/security @@ -133,8 +133,8 @@ resistance_flags = NONE flags_2 = RAD_PROTECT_CONTENTS_2 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/suit/radiation @@ -156,5 +156,5 @@ resistance_flags = NONE flags_2 = RAD_PROTECT_CONTENTS_2 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index d7c146e3602..8d529d82160 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -38,9 +38,9 @@ item_state = "wizhatmime" dog_fashion = null sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/wizard/fake @@ -113,9 +113,9 @@ icon_state = "wizzmime" item_state = "wizzmime" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) /obj/item/clothing/suit/wizrobe/marisa diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 53b53f54f48..b17f32df7a6 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -124,7 +124,7 @@ item_color = "waistcoat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/stethoscope @@ -526,7 +526,7 @@ item_color = "cowboyshirt" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/short_sleeved @@ -537,7 +537,7 @@ item_color = "cowboyshirt_s" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/white @@ -548,7 +548,7 @@ item_color = "cowboyshirt_white" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/white/short_sleeved @@ -559,7 +559,7 @@ item_color = "cowboyshirt_whites" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/pink @@ -570,7 +570,7 @@ item_color = "cowboyshirt_pink" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved @@ -581,7 +581,7 @@ item_color = "cowboyshirt_pinks" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/navy @@ -592,7 +592,7 @@ item_color = "cowboyshirt_navy" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved @@ -603,7 +603,7 @@ item_color = "cowboyshirt_navys" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/red @@ -614,7 +614,7 @@ item_color = "cowboyshirt_red" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/red/short_sleeved @@ -625,9 +625,9 @@ item_color = "cowboyshirt_reds" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) /obj/item/clothing/accessory/corset diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 8d7cbc1a143..dc15bd65d88 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -80,7 +80,7 @@ item_color = "webbing" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/storage/black_vest diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 8d0e68eddb0..607113803fd 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -109,7 +109,7 @@ item_color = "psyche" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi' ) /obj/item/clothing/under/color/lightblue diff --git a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm index b3d7ce83431..05cb5a1fb71 100644 --- a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm +++ b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm @@ -9,7 +9,7 @@ var/extinguishes_left = 5 icon = 'icons/obj/clothing/species/plasmaman/uniform.dmi' species_restricted = list("Plasmaman") - sprite_sheets = list("Plasmaman" = 'icons/mob/species/plasmaman/uniform.dmi') + sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/uniform.dmi') icon_state = "plasmaman" item_state = "plasmaman" item_color = "plasmaman" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index f022ab40d9d..6908a405a88 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -84,7 +84,7 @@ strip_delay = 50 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi' ) /* diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e645c9e264e..f316f486379 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -344,7 +344,7 @@ M.icon = 'icons/obj/custom_items.dmi' M.icon_state = "gas_tariq" M.sprite_sheets = list( - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi' ) user.update_icons() qdel(src) @@ -935,7 +935,7 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "k3_webbing" - sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/toggle) suit_adjusted = 0 @@ -1648,7 +1648,7 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/uniform.dmi') icon_state = "kiaoutfit" item_state = "kiaoutfit" item_color = "kiaoutfit" @@ -1671,7 +1671,7 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - sprite_sheets = list("Vox" = 'icons/mob/species/vox/mask.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi') icon_state = "kiamask" item_state = "kiamask" item_color = "kiamask" @@ -1704,7 +1704,7 @@ desc = "A simple black dress with a white undercoat, tied with a blue ribbon." lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/uniform.dmi') icon = 'icons/obj/custom_items.dmi' icon_state = "kikeridress" item_state = "kikeridress" diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 8315d0ef781..b76c036390b 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -16,11 +16,11 @@ hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi' ) /obj/item/clothing/head/hooded/explorer @@ -37,10 +37,10 @@ resistance_flags = FIRE_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi', - "Skrell" = 'icons/mob/species/skrell/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi' ) /obj/item/clothing/suit/space/hostile_environment diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index af90d80e995..79d6c50ebfc 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -250,7 +250,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) apply_overlay(LIMBS_LAYER) //Underwear - var/icon/underwear_standing = new /icon('icons/mob/underwear.dmi', "nude") + var/icon/underwear_standing = new /icon('icons/mob/clothing/underwear.dmi', "nude") if(underwear && dna.species.clothing_flags & HAS_UNDERWEAR) var/datum/sprite_accessory/underwear/U = GLOB.underwear_list[underwear] if(U) @@ -546,7 +546,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(!t_color) t_color = icon_state - var/mutable_appearance/standing = mutable_appearance('icons/mob/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) + var/mutable_appearance/standing = mutable_appearance('icons/mob/clothing/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) if(w_uniform.icon_override) standing.icon = w_uniform.icon_override @@ -638,7 +638,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(gloves.sprite_sheets && gloves.sprite_sheets[dna.species.name]) standing = mutable_appearance(gloves.sprite_sheets[dna.species.name], "[t_state]", layer = -GLOVES_LAYER) else - standing = mutable_appearance('icons/mob/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) + standing = mutable_appearance('icons/mob/clothing/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) if(gloves.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands") @@ -676,7 +676,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(glasses.sprite_sheets && glasses.sprite_sheets[head_organ.dna.species.name]) new_glasses = mutable_appearance(glasses.sprite_sheets[head_organ.dna.species.name], "[glasses.icon_state]", layer = -GLASSES_LAYER) else - new_glasses = mutable_appearance('icons/mob/eyes.dmi', "[glasses.icon_state]", layer = -GLASSES_LAYER) + new_glasses = mutable_appearance('icons/mob/clothing/eyes.dmi', "[glasses.icon_state]", layer = -GLASSES_LAYER) var/datum/sprite_accessory/hair/hair_style = GLOB.hair_styles_full_list[head_organ.h_style] var/obj/item/clothing/glasses/G = glasses @@ -722,7 +722,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(l_ear.sprite_sheets && l_ear.sprite_sheets[dna.species.name]) overlays_standing[EARS_LAYER] = mutable_appearance(l_ear.sprite_sheets[dna.species.name], "[t_type]", layer = -EARS_LAYER) else - overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/ears.dmi', "[t_type]", layer = -EARS_LAYER) + overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/clothing/ears.dmi', "[t_type]", layer = -EARS_LAYER) if(r_ear) if(client && hud_used && hud_used.hud_shown) @@ -739,7 +739,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(r_ear.sprite_sheets && r_ear.sprite_sheets[dna.species.name]) overlays_standing[EARS_LAYER] = mutable_appearance(r_ear.sprite_sheets[dna.species.name], "[t_type]", layer = -EARS_LAYER) else - overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/ears.dmi', "[t_type]", layer = -EARS_LAYER) + overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/clothing/ears.dmi', "[t_type]", layer = -EARS_LAYER) apply_overlay(EARS_LAYER) /mob/living/carbon/human/update_inv_shoes() @@ -761,7 +761,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(shoes.sprite_sheets && shoes.sprite_sheets[dna.species.name]) standing = mutable_appearance(shoes.sprite_sheets[dna.species.name], "[shoes.icon_state]", layer = -SHOES_LAYER) else - standing = mutable_appearance('icons/mob/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER) + standing = mutable_appearance('icons/mob/clothing/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER) if(shoes.blood_DNA) @@ -793,7 +793,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) var/t_state = s_store.item_state if(!t_state) t_state = s_store.icon_state - var/dmi='icons/mob/belt_mirror.dmi' + var/dmi='icons/mob/clothing/belt_mirror.dmi' overlays_standing[SUIT_STORE_LAYER] = mutable_appearance(dmi, "[t_state]", layer = -SUIT_STORE_LAYER) s_store.screen_loc = ui_sstore1 //TODO apply_overlay(SUIT_STORE_LAYER) @@ -814,7 +814,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(head.sprite_sheets && head.sprite_sheets[dna.species.name]) standing = mutable_appearance(head.sprite_sheets[dna.species.name], "[head.icon_state]", layer = -HEAD_LAYER) else - standing = mutable_appearance('icons/mob/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER) + standing = mutable_appearance('icons/mob/clothing/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER) if(head.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "helmetblood") @@ -847,7 +847,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(belt.sprite_sheets && belt.sprite_sheets[dna.species.name]) overlays_standing[BELT_LAYER] = mutable_appearance(belt.sprite_sheets[dna.species.name], "[t_state]", layer = -BELT_LAYER) else - overlays_standing[BELT_LAYER] = mutable_appearance('icons/mob/belt.dmi', "[t_state]", layer = -BELT_LAYER) + overlays_standing[BELT_LAYER] = mutable_appearance('icons/mob/clothing/belt.dmi', "[t_state]", layer = -BELT_LAYER) apply_overlay(BELT_LAYER) @@ -870,7 +870,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.name]) standing = mutable_appearance(wear_suit.sprite_sheets[dna.species.name], "[wear_suit.icon_state]", layer = -SUIT_LAYER) else - standing = mutable_appearance('icons/mob/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER) + standing = mutable_appearance('icons/mob/clothing/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER) if(wear_suit.breakouttime) drop_l_hand() @@ -951,7 +951,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) mask_icon = new(wear_mask.sprite_sheets[dna.species.name]) standing = mutable_appearance(wear_mask.sprite_sheets[dna.species.name], "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) else - standing = mutable_appearance('icons/mob/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) + standing = mutable_appearance('icons/mob/clothing/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) if(!istype(wear_mask, /obj/item/clothing/mask/cigarette) && wear_mask.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "maskblood") @@ -975,7 +975,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(back.sprite_sheets && back.sprite_sheets[dna.species.name]) standing = mutable_appearance(back.sprite_sheets[dna.species.name], "[back.icon_state]", layer = -BACK_LAYER) else - standing = mutable_appearance('icons/mob/back.dmi', "[back.icon_state]", layer = -BACK_LAYER) + standing = mutable_appearance('icons/mob/clothing/back.dmi', "[back.icon_state]", layer = -BACK_LAYER) //create the image standing.alpha = back.alpha @@ -1239,11 +1239,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) update_tail_layer() //Adds a collar overlay above the helmet layer if the suit has one -// Suit needs an identically named sprite in icons/mob/collar.dmi -// For suits with sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi. +// Suit needs an identically named sprite in icons/mob/clothing/collar.dmi +// For suits with sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/clothing/species/[species_name_here]/collar.dmi. /mob/living/carbon/human/proc/update_collar() remove_overlay(COLLAR_LAYER) - var/icon/C = new('icons/mob/collar.dmi') + var/icon/C = new('icons/mob/clothing/collar.dmi') var/mutable_appearance/standing = null if(wear_suit) diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 3fe022269da..ec5ae76c33d 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -200,11 +200,11 @@ /datum/preferences/proc/blend_backpack(icon/clothes_s, backbag, satchel, backpack="backpack") switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', backpack), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', backpack), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', satchel), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', satchel), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) return clothes_s /datum/preferences/proc/update_preview_icon(for_observer=0) //seriously. This is horrendous. @@ -400,538 +400,538 @@ socks_s = new/icon(u3_icon, "sk_[U3.icon_state]_s", ICON_OVERLAY) var/icon/clothes_s = null - var/uniform_dmi='icons/mob/uniform.dmi' + var/uniform_dmi='icons/mob/clothing/uniform.dmi' if(job_support_low & JOB_CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high' clothes_s = new /icon(uniform_dmi, "grey_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(backbag == 2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_support_high)//I hate how this looks, but there's no reason to go through this switch if it's empty switch(job_support_high) if(JOB_HOP) clothes_s = new /icon(uniform_dmi, "hop_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "ianshirt"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_BARTENDER) clothes_s = new /icon(uniform_dmi, "ba_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "tophat"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_BOTANIST) clothes_s = new /icon(uniform_dmi, "hydroponics_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "ggloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "apron"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "nymph"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-hyd"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHEF) clothes_s = new /icon(uniform_dmi, "chef_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "chef"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "apronchef"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_JANITOR) clothes_s = new /icon(uniform_dmi, "janitor_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bio_janitor"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_LIBRARIAN) clothes_s = new /icon(uniform_dmi, "red_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hairflower"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_QUARTERMASTER) clothes_s = new /icon(uniform_dmi, "qm_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "poncho"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CARGOTECH) clothes_s = new /icon(uniform_dmi, "cargotech_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "flat_cap"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_MINER) clothes_s = new /icon(uniform_dmi, "explorer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "explorer"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "bearpelt"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "explorerpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "explorerpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-explorer"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-explorer"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_LAWYER) clothes_s = new /icon(uniform_dmi, "internalaffairs_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suitjacket_blue"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHAPLAIN) clothes_s = new /icon(uniform_dmi, "chapblack_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "imperium_monk"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CLOWN) clothes_s = new /icon(uniform_dmi, "clown_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "clown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "clown"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "clownpack"), ICON_OVERLAY) if(JOB_MIME) clothes_s = new /icon(uniform_dmi, "mime_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "lgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "mime"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suspenders"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_medsci_high) switch(job_medsci_high) if(JOB_RD) clothes_s = new /icon(uniform_dmi, "director_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "petehat"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-tox"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_SCIENTIST) clothes_s = new /icon(uniform_dmi, "toxinswhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "metroid"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-tox"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHEMIST) clothes_s = new /icon(uniform_dmi, "chemistrywhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labgreen"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-chem"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CMO) clothes_s = new /icon(uniform_dmi, "cmo_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bio_cmo"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_DOCTOR) clothes_s = new /icon(uniform_dmi, "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "surgeon"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CORONER) clothes_s = new /icon(uniform_dmi, "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "mortician"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "mortician"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_GENETICIST) clothes_s = new /icon(uniform_dmi, "geneticswhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "monkeysuit"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-gen"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_VIROLOGIST) clothes_s = new /icon(uniform_dmi, "virologywhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "sterile"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "plaguedoctor"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-vir"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_PSYCHIATRIST) clothes_s = new /icon(uniform_dmi, "psych_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_PARAMEDIC) clothes_s = new /icon(uniform_dmi, "paramedic_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigoff"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "bluesoft"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cigoff"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "bluesoft"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(JOB_ROBOTICIST) clothes_s = new /icon(uniform_dmi, "robotics_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if(prob(1)) clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_engsec_high) switch(job_engsec_high) if(JOB_CAPTAIN) clothes_s = new /icon(uniform_dmi, "captain_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "centcomcaptain"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "captain"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-cap"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_HOS) clothes_s = new /icon(uniform_dmi, "hosred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_hos"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_hos"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_WARDEN) - clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s") + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "warden_s") if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "slippers_worn"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_DETECTIVE) clothes_s = new /icon(uniform_dmi, "detective_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cigaron"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "detective"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_OFFICER) clothes_s = new /icon(uniform_dmi, "secred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_officer"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_officer"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHIEF) clothes_s = new /icon(uniform_dmi, "chief_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_white"), ICON_OVERLAY) if(prob(1)) clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "blueprints"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_ENGINEER) clothes_s = new /icon(uniform_dmi, "engine_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "hazard"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_ATMOSTECH) clothes_s = new /icon(uniform_dmi, "atmos_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "firesuit"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_AI)//Gives AI and borgs assistant-wear, so they can still customize their character clothes_s = new /icon(uniform_dmi, "grey_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "straight_jacket"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "cardborg_h"), ICON_OVERLAY) if(backbag == 2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CYBORG) clothes_s = new /icon(uniform_dmi, "grey_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "cardborg"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "cardborg_h"), ICON_OVERLAY) if(backbag == 2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_karma_high) switch(job_karma_high) if(JOB_MECHANIC) clothes_s = new /icon(uniform_dmi, "mechanic_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_PILOT) clothes_s = new /icon(uniform_dmi, "secred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bomber"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_BRIGDOC) clothes_s = new /icon(uniform_dmi, "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_NANO) clothes_s = new /icon(uniform_dmi, "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_BLUESHIELD) clothes_s = new /icon(uniform_dmi, "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "blueshield"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_JUDGE) clothes_s = new /icon(uniform_dmi, "really_black_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "mercy_hood"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "mercy_hood"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_UNDERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(disabilities & DISABILITY_FLAG_NEARSIGHTED) - preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY) + preview_icon.Blend(new /icon('icons/mob/clothing/eyes.dmi', "glasses"), ICON_OVERLAY) // Observers get tourist outfit. if(for_observer) clothes_s = new /icon(uniform_dmi, "tourist_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(backbag == 2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(underwear_s) preview_icon.Blend(underwear_s, ICON_OVERLAY) diff --git a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm index 6e618dba0d0..7d9be34c063 100644 --- a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm @@ -167,11 +167,11 @@ // Underwear Definitions // /////////////////////////// /datum/sprite_accessory/underwear - icon = 'icons/mob/underwear.dmi' + icon = 'icons/mob/clothing/underwear.dmi' species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/underwear.dmi', - "Grey" = 'icons/mob/species/grey/underwear.dmi' + "Vox" = 'icons/mob/clothing/species/vox/underwear.dmi', + "Grey" = 'icons/mob/clothing/species/grey/underwear.dmi' ) gender = NEUTER @@ -297,11 +297,11 @@ // Undershirt Definitions // //////////////////////////// /datum/sprite_accessory/undershirt - icon = 'icons/mob/underwear.dmi' + icon = 'icons/mob/clothing/underwear.dmi' species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/underwear.dmi', - "Grey" = 'icons/mob/species/grey/underwear.dmi') + "Vox" = 'icons/mob/clothing/species/vox/underwear.dmi', + "Grey" = 'icons/mob/clothing/species/grey/underwear.dmi') gender = NEUTER /datum/sprite_accessory/undershirt/nude @@ -536,9 +536,9 @@ // Socks Definitions // /////////////////////// /datum/sprite_accessory/socks - icon = 'icons/mob/underwear.dmi' + icon = 'icons/mob/clothing/underwear.dmi' species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox") - sprite_sheets = list("Vox" = 'icons/mob/species/vox/underwear.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/underwear.dmi') gender = NEUTER /datum/sprite_accessory/socks/nude diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index f88ada9f0b4..b61258440bd 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -13,10 +13,10 @@ Contents: item_state = "s-ninja_mask" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi' ) var/obj/item/voice_changer/voice_changer diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 973e7da9596..135923c6ef6 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -52,7 +52,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/sonic) cell_type = /obj/item/stock_parts/cell/super restricted_species = list(/datum/species/vox/armalis) - sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/species/armalis/held.dmi') //Big guns big birds. + sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/held.dmi') //Big guns big birds. /obj/item/gun/energy/noisecannon/update_icon() return diff --git a/icons/mob/back.dmi b/icons/mob/clothing/back.dmi similarity index 100% rename from icons/mob/back.dmi rename to icons/mob/clothing/back.dmi diff --git a/icons/mob/belt.dmi b/icons/mob/clothing/belt.dmi similarity index 100% rename from icons/mob/belt.dmi rename to icons/mob/clothing/belt.dmi diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi similarity index 100% rename from icons/mob/belt_mirror.dmi rename to icons/mob/clothing/belt_mirror.dmi diff --git a/icons/mob/collar.dmi b/icons/mob/clothing/collar.dmi similarity index 100% rename from icons/mob/collar.dmi rename to icons/mob/clothing/collar.dmi diff --git a/icons/mob/ears.dmi b/icons/mob/clothing/ears.dmi similarity index 100% rename from icons/mob/ears.dmi rename to icons/mob/clothing/ears.dmi diff --git a/icons/mob/eyes.dmi b/icons/mob/clothing/eyes.dmi similarity index 100% rename from icons/mob/eyes.dmi rename to icons/mob/clothing/eyes.dmi diff --git a/icons/mob/feet.dmi b/icons/mob/clothing/feet.dmi similarity index 100% rename from icons/mob/feet.dmi rename to icons/mob/clothing/feet.dmi diff --git a/icons/mob/hands.dmi b/icons/mob/clothing/hands.dmi similarity index 100% rename from icons/mob/hands.dmi rename to icons/mob/clothing/hands.dmi diff --git a/icons/mob/head.dmi b/icons/mob/clothing/head.dmi similarity index 100% rename from icons/mob/head.dmi rename to icons/mob/clothing/head.dmi diff --git a/icons/mob/mask.dmi b/icons/mob/clothing/mask.dmi similarity index 100% rename from icons/mob/mask.dmi rename to icons/mob/clothing/mask.dmi diff --git a/icons/mob/species/armalis/back.dmi b/icons/mob/clothing/species/armalis/back.dmi similarity index 100% rename from icons/mob/species/armalis/back.dmi rename to icons/mob/clothing/species/armalis/back.dmi diff --git a/icons/mob/species/armalis/belt.dmi b/icons/mob/clothing/species/armalis/belt.dmi similarity index 100% rename from icons/mob/species/armalis/belt.dmi rename to icons/mob/clothing/species/armalis/belt.dmi diff --git a/icons/mob/species/armalis/ears.dmi b/icons/mob/clothing/species/armalis/ears.dmi similarity index 100% rename from icons/mob/species/armalis/ears.dmi rename to icons/mob/clothing/species/armalis/ears.dmi diff --git a/icons/mob/species/armalis/feet.dmi b/icons/mob/clothing/species/armalis/feet.dmi similarity index 100% rename from icons/mob/species/armalis/feet.dmi rename to icons/mob/clothing/species/armalis/feet.dmi diff --git a/icons/mob/species/armalis/gloves.dmi b/icons/mob/clothing/species/armalis/gloves.dmi similarity index 100% rename from icons/mob/species/armalis/gloves.dmi rename to icons/mob/clothing/species/armalis/gloves.dmi diff --git a/icons/mob/species/armalis/head.dmi b/icons/mob/clothing/species/armalis/head.dmi similarity index 100% rename from icons/mob/species/armalis/head.dmi rename to icons/mob/clothing/species/armalis/head.dmi diff --git a/icons/mob/species/armalis/held.dmi b/icons/mob/clothing/species/armalis/held.dmi similarity index 100% rename from icons/mob/species/armalis/held.dmi rename to icons/mob/clothing/species/armalis/held.dmi diff --git a/icons/mob/species/armalis/mask.dmi b/icons/mob/clothing/species/armalis/mask.dmi similarity index 100% rename from icons/mob/species/armalis/mask.dmi rename to icons/mob/clothing/species/armalis/mask.dmi diff --git a/icons/mob/species/armalis/suit.dmi b/icons/mob/clothing/species/armalis/suit.dmi similarity index 100% rename from icons/mob/species/armalis/suit.dmi rename to icons/mob/clothing/species/armalis/suit.dmi diff --git a/icons/mob/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi similarity index 100% rename from icons/mob/species/drask/eyes.dmi rename to icons/mob/clothing/species/drask/eyes.dmi diff --git a/icons/mob/species/drask/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi similarity index 100% rename from icons/mob/species/drask/gloves.dmi rename to icons/mob/clothing/species/drask/gloves.dmi diff --git a/icons/mob/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi similarity index 100% rename from icons/mob/species/drask/head.dmi rename to icons/mob/clothing/species/drask/head.dmi diff --git a/icons/mob/species/drask/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi similarity index 100% rename from icons/mob/species/drask/helmet.dmi rename to icons/mob/clothing/species/drask/helmet.dmi diff --git a/icons/mob/species/drask/mask.dmi b/icons/mob/clothing/species/drask/mask.dmi similarity index 100% rename from icons/mob/species/drask/mask.dmi rename to icons/mob/clothing/species/drask/mask.dmi diff --git a/icons/mob/species/drask/shoes.dmi b/icons/mob/clothing/species/drask/shoes.dmi similarity index 100% rename from icons/mob/species/drask/shoes.dmi rename to icons/mob/clothing/species/drask/shoes.dmi diff --git a/icons/mob/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi similarity index 100% rename from icons/mob/species/drask/suit.dmi rename to icons/mob/clothing/species/drask/suit.dmi diff --git a/icons/mob/species/drask/uniform.dmi b/icons/mob/clothing/species/drask/uniform.dmi similarity index 100% rename from icons/mob/species/drask/uniform.dmi rename to icons/mob/clothing/species/drask/uniform.dmi diff --git a/icons/mob/species/grey/back.dmi b/icons/mob/clothing/species/grey/back.dmi similarity index 100% rename from icons/mob/species/grey/back.dmi rename to icons/mob/clothing/species/grey/back.dmi diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi similarity index 100% rename from icons/mob/species/grey/eyes.dmi rename to icons/mob/clothing/species/grey/eyes.dmi diff --git a/icons/mob/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi similarity index 100% rename from icons/mob/species/grey/head.dmi rename to icons/mob/clothing/species/grey/head.dmi diff --git a/icons/mob/species/grey/helmet.dmi b/icons/mob/clothing/species/grey/helmet.dmi similarity index 100% rename from icons/mob/species/grey/helmet.dmi rename to icons/mob/clothing/species/grey/helmet.dmi diff --git a/icons/mob/species/grey/mask.dmi b/icons/mob/clothing/species/grey/mask.dmi similarity index 100% rename from icons/mob/species/grey/mask.dmi rename to icons/mob/clothing/species/grey/mask.dmi diff --git a/icons/mob/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi similarity index 100% rename from icons/mob/species/grey/suit.dmi rename to icons/mob/clothing/species/grey/suit.dmi diff --git a/icons/mob/species/grey/underwear.dmi b/icons/mob/clothing/species/grey/underwear.dmi similarity index 100% rename from icons/mob/species/grey/underwear.dmi rename to icons/mob/clothing/species/grey/underwear.dmi diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/clothing/species/grey/uniform.dmi similarity index 100% rename from icons/mob/species/grey/uniform.dmi rename to icons/mob/clothing/species/grey/uniform.dmi diff --git a/icons/mob/species/kidan/head.dmi b/icons/mob/clothing/species/kidan/head.dmi similarity index 100% rename from icons/mob/species/kidan/head.dmi rename to icons/mob/clothing/species/kidan/head.dmi diff --git a/icons/mob/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi similarity index 100% rename from icons/mob/species/plasmaman/helmet.dmi rename to icons/mob/clothing/species/plasmaman/helmet.dmi diff --git a/icons/mob/species/plasmaman/mask.dmi b/icons/mob/clothing/species/plasmaman/mask.dmi similarity index 100% rename from icons/mob/species/plasmaman/mask.dmi rename to icons/mob/clothing/species/plasmaman/mask.dmi diff --git a/icons/mob/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi similarity index 100% rename from icons/mob/species/plasmaman/uniform.dmi rename to icons/mob/clothing/species/plasmaman/uniform.dmi diff --git a/icons/mob/species/skrell/head.dmi b/icons/mob/clothing/species/skrell/head.dmi similarity index 100% rename from icons/mob/species/skrell/head.dmi rename to icons/mob/clothing/species/skrell/head.dmi diff --git a/icons/mob/species/skrell/held.dmi b/icons/mob/clothing/species/skrell/held.dmi similarity index 100% rename from icons/mob/species/skrell/held.dmi rename to icons/mob/clothing/species/skrell/held.dmi diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/clothing/species/skrell/helmet.dmi similarity index 100% rename from icons/mob/species/skrell/helmet.dmi rename to icons/mob/clothing/species/skrell/helmet.dmi diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/clothing/species/skrell/suit.dmi similarity index 100% rename from icons/mob/species/skrell/suit.dmi rename to icons/mob/clothing/species/skrell/suit.dmi diff --git a/icons/mob/species/tajaran/head.dmi b/icons/mob/clothing/species/tajaran/head.dmi similarity index 100% rename from icons/mob/species/tajaran/head.dmi rename to icons/mob/clothing/species/tajaran/head.dmi diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/clothing/species/tajaran/helmet.dmi similarity index 100% rename from icons/mob/species/tajaran/helmet.dmi rename to icons/mob/clothing/species/tajaran/helmet.dmi diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/clothing/species/tajaran/mask.dmi similarity index 100% rename from icons/mob/species/tajaran/mask.dmi rename to icons/mob/clothing/species/tajaran/mask.dmi diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/clothing/species/tajaran/suit.dmi similarity index 100% rename from icons/mob/species/tajaran/suit.dmi rename to icons/mob/clothing/species/tajaran/suit.dmi diff --git a/icons/mob/species/unathi/feet.dmi b/icons/mob/clothing/species/unathi/feet.dmi similarity index 100% rename from icons/mob/species/unathi/feet.dmi rename to icons/mob/clothing/species/unathi/feet.dmi diff --git a/icons/mob/species/unathi/gloves.dmi b/icons/mob/clothing/species/unathi/gloves.dmi similarity index 100% rename from icons/mob/species/unathi/gloves.dmi rename to icons/mob/clothing/species/unathi/gloves.dmi diff --git a/icons/mob/species/unathi/head.dmi b/icons/mob/clothing/species/unathi/head.dmi similarity index 100% rename from icons/mob/species/unathi/head.dmi rename to icons/mob/clothing/species/unathi/head.dmi diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/clothing/species/unathi/helmet.dmi similarity index 100% rename from icons/mob/species/unathi/helmet.dmi rename to icons/mob/clothing/species/unathi/helmet.dmi diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/clothing/species/unathi/mask.dmi similarity index 100% rename from icons/mob/species/unathi/mask.dmi rename to icons/mob/clothing/species/unathi/mask.dmi diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/clothing/species/unathi/suit.dmi similarity index 100% rename from icons/mob/species/unathi/suit.dmi rename to icons/mob/clothing/species/unathi/suit.dmi diff --git a/icons/mob/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi similarity index 100% rename from icons/mob/species/vox/back.dmi rename to icons/mob/clothing/species/vox/back.dmi diff --git a/icons/mob/species/vox/collar.dmi b/icons/mob/clothing/species/vox/collar.dmi similarity index 100% rename from icons/mob/species/vox/collar.dmi rename to icons/mob/clothing/species/vox/collar.dmi diff --git a/icons/mob/species/vox/ears.dmi b/icons/mob/clothing/species/vox/ears.dmi similarity index 100% rename from icons/mob/species/vox/ears.dmi rename to icons/mob/clothing/species/vox/ears.dmi diff --git a/icons/mob/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi similarity index 100% rename from icons/mob/species/vox/eyes.dmi rename to icons/mob/clothing/species/vox/eyes.dmi diff --git a/icons/mob/species/vox/feet.dmi b/icons/mob/clothing/species/vox/feet.dmi similarity index 100% rename from icons/mob/species/vox/feet.dmi rename to icons/mob/clothing/species/vox/feet.dmi diff --git a/icons/mob/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi similarity index 100% rename from icons/mob/species/vox/gloves.dmi rename to icons/mob/clothing/species/vox/gloves.dmi diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi similarity index 100% rename from icons/mob/species/vox/head.dmi rename to icons/mob/clothing/species/vox/head.dmi diff --git a/icons/mob/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi similarity index 100% rename from icons/mob/species/vox/helmet.dmi rename to icons/mob/clothing/species/vox/helmet.dmi diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/clothing/species/vox/mask.dmi similarity index 100% rename from icons/mob/species/vox/mask.dmi rename to icons/mob/clothing/species/vox/mask.dmi diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/clothing/species/vox/shoes.dmi similarity index 100% rename from icons/mob/species/vox/shoes.dmi rename to icons/mob/clothing/species/vox/shoes.dmi diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi similarity index 100% rename from icons/mob/species/vox/suit.dmi rename to icons/mob/clothing/species/vox/suit.dmi diff --git a/icons/mob/species/vox/underwear.dmi b/icons/mob/clothing/species/vox/underwear.dmi similarity index 100% rename from icons/mob/species/vox/underwear.dmi rename to icons/mob/clothing/species/vox/underwear.dmi diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi similarity index 100% rename from icons/mob/species/vox/uniform.dmi rename to icons/mob/clothing/species/vox/uniform.dmi diff --git a/icons/mob/species/vulpkanin/head.dmi b/icons/mob/clothing/species/vulpkanin/head.dmi similarity index 100% rename from icons/mob/species/vulpkanin/head.dmi rename to icons/mob/clothing/species/vulpkanin/head.dmi diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/clothing/species/vulpkanin/helmet.dmi similarity index 100% rename from icons/mob/species/vulpkanin/helmet.dmi rename to icons/mob/clothing/species/vulpkanin/helmet.dmi diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/clothing/species/vulpkanin/mask.dmi similarity index 100% rename from icons/mob/species/vulpkanin/mask.dmi rename to icons/mob/clothing/species/vulpkanin/mask.dmi diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/clothing/species/vulpkanin/suit.dmi similarity index 100% rename from icons/mob/species/vulpkanin/suit.dmi rename to icons/mob/clothing/species/vulpkanin/suit.dmi diff --git a/icons/mob/suit.dmi b/icons/mob/clothing/suit.dmi similarity index 100% rename from icons/mob/suit.dmi rename to icons/mob/clothing/suit.dmi diff --git a/icons/mob/underwear.dmi b/icons/mob/clothing/underwear.dmi similarity index 100% rename from icons/mob/underwear.dmi rename to icons/mob/clothing/underwear.dmi diff --git a/icons/mob/uniform.dmi b/icons/mob/clothing/uniform.dmi similarity index 100% rename from icons/mob/uniform.dmi rename to icons/mob/clothing/uniform.dmi diff --git a/icons/mob/species/drask/gloves1.dmi b/icons/mob/species/drask/gloves1.dmi deleted file mode 100644 index 70423488ef506f85056962a7a3d40bf5eb0f231b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18365 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