diff --git a/code/game/objects/items/weapons/traps_vr.dm b/code/game/objects/items/weapons/traps_vr.dm index d6ae54e7179..079165a2eb9 100644 --- a/code/game/objects/items/weapons/traps_vr.dm +++ b/code/game/objects/items/weapons/traps_vr.dm @@ -1,7 +1,7 @@ /obj/item/beartrap slot_flags = SLOT_MASK item_icons = list( - slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi' + slot_wear_mask_str = 'icons/inventory/face/mob.dmi' ) /obj/item/beartrap/equipped() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 78be8465a0a..ef9dee63b35 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -574,13 +574,24 @@ heat_protection = FALSE //No heat protection anywhere cold_protection = FALSE //No heat protection anywhere slot_flags = SLOT_MASK - body_parts_covered = FACE|EYES + body_parts_covered = HEAD|FACE|EYES blood_sprite_state = "maskblood" + item_icons = list( + slot_wear_mask_str = 'icons/inventory/face/mob.dmi' + ) sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi', - SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi', - SPECIES_TAJARAN = 'icons/inventory/face/mob_tajaran.dmi', - SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi' + SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi', + SPECIES_TAJARAN = 'icons/inventory/face/mob_tajaran.dmi', + SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi', + SPECIES_SERGAL = 'icons/inventory/face/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/face/mob_nevrean.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/face/mob_fox.dmi', + SPECIES_ZORREN_FLAT = 'icons/inventory/face/mob_fennec.dmi', + SPECIES_AKULA = 'icons/inventory/face/mob_akula.dmi', + SPECIES_VULPKANIN = 'icons/inventory/face/mob_vulpkanin.dmi', + SPECIES_XENOCHIMERA = 'icons/inventory/face/mob_tajaran.dmi', + SPECIES_WEREBEAST = 'icons/inventory/face/mob_werebeast.dmi' ) var/voicechange = 0 diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index 2b80e28e7a4..10898274bd9 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -56,35 +56,6 @@ src.visible_message(span_red("\The [src] moves a little!")) to_chat(user, span_red("You throw yourself against the inside of \the [src]!")) -//Mask -/obj/item/clothing/mask - name = "mask" - icon = 'icons/inventory/face/item_vr.dmi' // This is intentional because of our custom species. - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi', - ) - body_parts_covered = HEAD|FACE|EYES - slot_flags = SLOT_MASK - item_icons = list( - slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi' - ) - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi', - SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi', - SPECIES_TAJARAN = 'icons/inventory/face/mob_tajaran.dmi', - SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi', - SPECIES_SERGAL = 'icons/inventory/face/mob_vr_sergal.dmi', - SPECIES_NEVREAN = 'icons/inventory/face/mob_vr_nevrean.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/face/mob_vr_fox.dmi', - SPECIES_ZORREN_FLAT = 'icons/inventory/face/mob_vr_fox.dmi', - SPECIES_AKULA = 'icons/inventory/face/mob_vr_akula.dmi', - SPECIES_VULPKANIN = 'icons/inventory/face/mob_vr_vulpkanin.dmi', - SPECIES_XENOCHIMERA = 'icons/inventory/face/mob_vr_tajaran.dmi', - SPECIES_WEREBEAST = 'icons/inventory/face/mob_vr_werebeast.dmi' - ) -//"Spider" = 'icons/inventory/mask/mob_spider.dmi' Add this later when they have custom mask sprites and everything. - /obj/item/clothing/under sensor_mode = 3 var/sensorpref = 5 diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index e4270a4fdfe..05448150e8e 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -12,7 +12,7 @@ BLIND // can't see anything /////////////////////////////////////////////////////////////////////// /obj/item/clothing/glasses - name = "glasses" + name = DEVELOPER_WARNING_NAME icon = 'icons/inventory/eyes/item.dmi' w_class = ITEMSIZE_SMALL slot_flags = SLOT_EYES @@ -31,8 +31,18 @@ BLIND // can't see anything pickup_sound = 'sound/items/pickup/accessory.ogg' sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi', - SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi' + SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/eyes/mob_werebeast.dmi', + SPECIES_TAJARAN = 'icons/inventory/eyes/mob_tajaran.dmi', + SPECIES_UNATHI = 'icons/inventory/eyes/mob_unathi.dmi', + SPECIES_SERGAL = 'icons/inventory/eyes/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/eyes/mob_nevrean.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/eyes/mob_fox.dmi', + SPECIES_ZORREN_FLAT = 'icons/inventory/eyes/mob_fennec.dmi', + SPECIES_AKULA = 'icons/inventory/eyes/mob_akula.dmi', + SPECIES_VULPKANIN = 'icons/inventory/eyes/mob_vulpkanin.dmi', + SPECIES_XENOCHIMERA = 'icons/inventory/eyes/mob_tajaran.dmi' ) var/glasses_layer_above = FALSE diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index 77e377ca3db..f943121dd96 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -64,8 +64,6 @@ /obj/item/clothing/glasses/graviton/medgravpatch name = "medical graviton eyepatch" desc = "A graviton eyepatch with a medical overlay." - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "medgravpatch" item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") actions_types = list(/datum/action/item_action/toggle_eyepatch) @@ -76,8 +74,6 @@ name = "tactical AR visor" desc = "Special AR visor designed for security teams, protects your eyes and provides useful data. The red lights provide extra style and intimidation." icon_state = "tacsecvis1" - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' enables_planes = list(VIS_CH_ID,VIS_CH_WANTED,VIS_CH_IMPTRACK,VIS_CH_IMPLOYAL,VIS_CH_IMPCHEM) flash_protection = FLASH_PROTECTION_MODERATE item_flags = AIRTIGHT @@ -115,70 +111,38 @@ /obj/item/clothing/glasses/tajblind name = "embroidered veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes." - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind" item_state = "tajblind" prescription = TRUE body_parts_covered = EYES - sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses/hud/health/tajblind name = "lightweight veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an installed medical HUD." - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind_med" item_state = "tajblind_med" body_parts_covered = EYES - sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses/sunglasses/sechud/tajblind name = "sleek veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an in-built security HUD." - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind_sec" item_state = "tajblind_sec" prescription = TRUE body_parts_covered = EYES - sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses/meson/prescription/tajblind name = "industrial veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has installed mesons." - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind_meson" item_state = "tajblind_meson" off_state = "tajblind" body_parts_covered = EYES - sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses/material/prescription/tajblind name = "mining veil" desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an installed material scanner." - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "tajblind_meson" item_state = "tajblind_meson" off_state = "tajblind" body_parts_covered = EYES - sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') - -/obj/item/clothing/glasses - name = DEVELOPER_WARNING_NAME - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi', - SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi', - SPECIES_WEREBEAST = 'icons/inventory/eyes/mob_werebeast.dmi', - SPECIES_TAJARAN = 'icons/inventory/eyes/mob_tajaran.dmi', - SPECIES_UNATHI = 'icons/inventory/eyes/mob_unathi.dmi', - SPECIES_SERGAL = 'icons/inventory/eyes/mob_sergal.dmi', - SPECIES_NEVREAN = 'icons/inventory/eyes/mob_nevrean.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/eyes/mob_fox.dmi', - SPECIES_ZORREN_FLAT = 'icons/inventory/eyes/mob_fennec.dmi', - SPECIES_AKULA = 'icons/inventory/eyes/mob_akula.dmi', - SPECIES_VULPKANIN = 'icons/inventory/eyes/mob_vulpkanin.dmi', - SPECIES_XENOCHIMERA = 'icons/inventory/eyes/mob_tajaran.dmi' - ) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 6b8df3d0e32..268612342d1 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -214,8 +214,6 @@ /obj/item/clothing/glasses/omnihud/visor name = "AR visor" desc = "The VZR-AR are a product based upon the classic AR Glasses, just more fashionable." - icon_override = 'icons/inventory/eyes/mob_vr.dmi' - icon = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "visor_CIV" item_state = "visor_CIV" @@ -354,8 +352,6 @@ /obj/item/clothing/glasses/hud/security/eyepatch2 name = "Security Hudpatch MKII" desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their ID status and security records. This updated model offers better ergonomics and updated sensors." - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "sec_eyepatch" item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") body_parts_covered = 0 @@ -448,9 +444,15 @@ desc = "A full-face, partially-obscuring visor favoured by certain subcultures and those with sensitive eyes. Covers the face and eyes, but it's not enough to actually hide your identity. The interior has a simple augmented-reality display that aids with daily tasks. It can be toggled in and out of corrective vision mode via integrated subroutine." icon_state = "mantle_HUD" item_state = "mantle_HUD" - body_parts_covered = FACE|EYES + body_parts_covered = EYES + flags_inv = HIDEFACE can_shade = FALSE +/obj/item/clothing/glasses/omnihud/mantle/ar_interact(var/mob/living/carbon/human/user) + if(tgarscreen) + tgarscreen.tgui_interact(user) + return 1 + /obj/item/clothing/glasses/omnihud/mantle/verb/switcheye() set name = "Toggle Autocorrective Vision" set category = "Object" @@ -473,6 +475,11 @@ tgarscreen_path = /datum/tgui_module/alarm_monitor/security/glasses enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_WANTED,VIS_AUGMENTED) +/obj/item/clothing/glasses/omnihud/mantle/sec/ar_interact(var/mob/living/carbon/human/user) + if(tgarscreen) + tgarscreen.tgui_interact(user) + return 1 + /obj/item/clothing/glasses/omnihud/mantle/med name = "medical AR mantle" desc = "A full-face, partially-obscuring visor favoured by certain subcultures and those with sensitive eyes. Covers the face and eyes, but it's not enough to actually hide your identity. The interior has a simple augmented-reality display that aids with daily tasks. It can be toggled in and out of corrective vision mode via integrated subroutine. This version includes extra medical-related functions." @@ -481,6 +488,11 @@ tgarscreen_path = /datum/tgui_module/crew_monitor/glasses enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_AUGMENTED) +/obj/item/clothing/glasses/omnihud/mantle/med/ar_interact(var/mob/living/carbon/human/user) + if(tgarscreen) + tgarscreen.tgui_interact(user) + return 1 + /obj/item/clothing/glasses/omnihud/mantle/eng name = "engineering AR mantle" desc = "A full-face, partially-obscuring visor favoured by certain subcultures and those with sensitive eyes. Covers the face and eyes, but it's not enough to actually hide your identity. The interior has a simple augmented-reality display that aids with daily tasks. It can be toggled in and out of corrective vision mode via integrated subroutine. This version includes extra engineering-related functions." @@ -489,6 +501,11 @@ actions_types = list(/datum/action/item_action/ar_console_station_alerts) tgarscreen_path = /datum/tgui_module/alarm_monitor/engineering/glasses +/obj/item/clothing/glasses/omnihud/mantle/med/ar_interact(var/mob/living/carbon/human/user) + if(tgarscreen) + tgarscreen.tgui_interact(user) + return 1 + /obj/item/clothing/glasses/omnihud/mantle/cmd name = "command AR mantle" desc = "A full-face, partially-obscuring visor favoured by certain subcultures and those with sensitive eyes. Covers the face and eyes, but it's not enough to actually hide your identity. The interior has a simple augmented-reality display that aids with daily tasks. It can be toggled in and out of corrective vision mode via integrated subroutine. This version includes extra command-related functions." @@ -497,3 +514,8 @@ enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED,VIS_AUGMENTED) actions_types = list(/datum/action/item_action/ar_console_all_alerts) tgarscreen_path = /datum/tgui_module/alarm_monitor/all/glasses + +/obj/item/clothing/glasses/omnihud/mantle/cmd/ar_interact(var/mob/living/carbon/human/user) + if(tgarscreen) + tgarscreen.tgui_interact(user) + return 1 diff --git a/code/modules/clothing/masks/breath_vr.dm b/code/modules/clothing/masks/breath_vr.dm index 706371a67a3..1eb6ca72eb0 100644 --- a/code/modules/clothing/masks/breath_vr.dm +++ b/code/modules/clothing/masks/breath_vr.dm @@ -7,8 +7,6 @@ name = "Spacer Tuned Mask" desc = "A mask designed for long-term use in areas where breathing comes at a premium." icon_state = "altevian-mask" - icon = 'icons/inventory/face/item_vr.dmi' - icon_override = 'icons/inventory/face/mob_vr.dmi' sprite_sheets = null item_state_slots = list(slot_r_hand_str = "breath", slot_l_hand_str = "breath") item_flags = AIRTIGHT|FLEXIBLEMATERIAL diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index a93e7abafed..60df8a82346 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -69,9 +69,7 @@ body_parts_covered = HEAD|FACE|EYES heat_protection = HEAD cold_protection = HEAD - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi' - ) + /obj/item/clothing/mask/gas/plaguedoctor/gold name = "gold plague doctor mask" desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply. This one is gold." diff --git a/code/modules/clothing/masks/gasmask_vr.dm b/code/modules/clothing/masks/gasmask_vr.dm index b34e29e16be..506f91032b7 100644 --- a/code/modules/clothing/masks/gasmask_vr.dm +++ b/code/modules/clothing/masks/gasmask_vr.dm @@ -14,7 +14,5 @@ name = "imperial soldier facemask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "ge_visor" - icon = 'icons/inventory/face/item_vr.dmi' - icon_override = 'icons/inventory/face/mob_vr.dmi' body_parts_covered = FACE|EYES flags_inv = HIDEEARS|HIDEEYES|HIDEFACE diff --git a/code/modules/clothing/masks/miscellaneous_vr.dm b/code/modules/clothing/masks/miscellaneous_vr.dm index 571f2a10f40..16468d2547b 100644 --- a/code/modules/clothing/masks/miscellaneous_vr.dm +++ b/code/modules/clothing/masks/miscellaneous_vr.dm @@ -1,13 +1,13 @@ /obj/item/clothing/mask/emotions sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi' + SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi' ) /obj/item/clothing/mask/lacemask name = "lace mask" desc = "A sheer lace mask that rests above the nose and trails down below the chin." - icon = 'icons/inventory/face/item_vr.dmi' + icon = 'icons/inventory/face/item.dmi' icon_state = "lace_mask" - icon_override = 'icons/inventory/face/mob_vr.dmi' + icon_override = 'icons/inventory/face/mob.dmi' item_flags = FLEXIBLEMATERIAL w_class = ITEMSIZE_SMALL diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index c9a0d0b7c2c..edef94cf283 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2551,8 +2551,6 @@ Departamental Swimsuits, for general use /obj/item/clothing/glasses/big_round name = "big round blue glasses" desc = "A set of glasses! They are big, round, and very reflective, catching the light and obscuring the eyes!" - icon = 'icons/inventory/eyes/item_vr.dmi' - icon_override = 'icons/inventory/eyes/mob_vr.dmi' icon_state = "bigroundglasses" slot_flags = SLOT_EYES | SLOT_EARS glasses_layer_above = TRUE diff --git a/icons/inventory/eyes/item.dmi b/icons/inventory/eyes/item.dmi index dae785a427c..c8c4d584a2f 100644 Binary files a/icons/inventory/eyes/item.dmi and b/icons/inventory/eyes/item.dmi differ diff --git a/icons/inventory/eyes/item_vr.dmi b/icons/inventory/eyes/item_vr.dmi deleted file mode 100644 index bf46a541b61..00000000000 Binary files a/icons/inventory/eyes/item_vr.dmi and /dev/null differ diff --git a/icons/inventory/eyes/mob.dmi b/icons/inventory/eyes/mob.dmi index aa54eba9c5e..f4771ab49b5 100644 Binary files a/icons/inventory/eyes/mob.dmi and b/icons/inventory/eyes/mob.dmi differ diff --git a/icons/inventory/eyes/mob_akula.dmi b/icons/inventory/eyes/mob_akula.dmi index d2ea4594f5a..3395e50b4d7 100644 Binary files a/icons/inventory/eyes/mob_akula.dmi and b/icons/inventory/eyes/mob_akula.dmi differ diff --git a/icons/inventory/eyes/mob_fennec.dmi b/icons/inventory/eyes/mob_fennec.dmi index c73d33509cc..e0dece3e157 100644 Binary files a/icons/inventory/eyes/mob_fennec.dmi and b/icons/inventory/eyes/mob_fennec.dmi differ diff --git a/icons/inventory/eyes/mob_fox.dmi b/icons/inventory/eyes/mob_fox.dmi index c73d33509cc..e0dece3e157 100644 Binary files a/icons/inventory/eyes/mob_fox.dmi and b/icons/inventory/eyes/mob_fox.dmi differ diff --git a/icons/inventory/eyes/mob_nevrean.dmi b/icons/inventory/eyes/mob_nevrean.dmi index aa54eba9c5e..f4771ab49b5 100644 Binary files a/icons/inventory/eyes/mob_nevrean.dmi and b/icons/inventory/eyes/mob_nevrean.dmi differ diff --git a/icons/inventory/eyes/mob_sergal.dmi b/icons/inventory/eyes/mob_sergal.dmi index 0d665372818..a009e2bdbde 100644 Binary files a/icons/inventory/eyes/mob_sergal.dmi and b/icons/inventory/eyes/mob_sergal.dmi differ diff --git a/icons/inventory/eyes/mob_tajaran.dmi b/icons/inventory/eyes/mob_tajaran.dmi index f5356394b06..df6acb5dc5e 100644 Binary files a/icons/inventory/eyes/mob_tajaran.dmi and b/icons/inventory/eyes/mob_tajaran.dmi differ diff --git a/icons/inventory/eyes/mob_unathi.dmi b/icons/inventory/eyes/mob_unathi.dmi index bcc009e2abe..b1f6acd95d8 100644 Binary files a/icons/inventory/eyes/mob_unathi.dmi and b/icons/inventory/eyes/mob_unathi.dmi differ diff --git a/icons/inventory/eyes/mob_vox.dmi b/icons/inventory/eyes/mob_vox.dmi index f6cfbf5b2ea..091a6f927f9 100644 Binary files a/icons/inventory/eyes/mob_vox.dmi and b/icons/inventory/eyes/mob_vox.dmi differ diff --git a/icons/inventory/eyes/mob_vr.dmi b/icons/inventory/eyes/mob_vr.dmi deleted file mode 100644 index 73d341e8890..00000000000 Binary files a/icons/inventory/eyes/mob_vr.dmi and /dev/null differ diff --git a/icons/inventory/eyes/mob_vulpkanin.dmi b/icons/inventory/eyes/mob_vulpkanin.dmi index e7ba7d25d23..583d66a90ad 100644 Binary files a/icons/inventory/eyes/mob_vulpkanin.dmi and b/icons/inventory/eyes/mob_vulpkanin.dmi differ diff --git a/icons/inventory/face/item.dmi b/icons/inventory/face/item.dmi index 618421ed5fb..349b03df956 100644 Binary files a/icons/inventory/face/item.dmi and b/icons/inventory/face/item.dmi differ diff --git a/icons/inventory/face/item_vr.dmi b/icons/inventory/face/item_vr.dmi deleted file mode 100644 index c9617820701..00000000000 Binary files a/icons/inventory/face/item_vr.dmi and /dev/null differ diff --git a/icons/inventory/face/mob.dmi b/icons/inventory/face/mob.dmi index 1b71f279dfa..028fb01ba65 100644 Binary files a/icons/inventory/face/mob.dmi and b/icons/inventory/face/mob.dmi differ diff --git a/icons/inventory/face/mob_vr_akula.dmi b/icons/inventory/face/mob_akula.dmi similarity index 100% rename from icons/inventory/face/mob_vr_akula.dmi rename to icons/inventory/face/mob_akula.dmi diff --git a/icons/inventory/face/mob_fennec.dmi b/icons/inventory/face/mob_fennec.dmi new file mode 100644 index 00000000000..4179157c787 Binary files /dev/null and b/icons/inventory/face/mob_fennec.dmi differ diff --git a/icons/inventory/face/mob_vr_fox.dmi b/icons/inventory/face/mob_fox.dmi similarity index 100% rename from icons/inventory/face/mob_vr_fox.dmi rename to icons/inventory/face/mob_fox.dmi diff --git a/icons/inventory/face/mob_vr_nevrean.dmi b/icons/inventory/face/mob_nevrean.dmi similarity index 100% rename from icons/inventory/face/mob_vr_nevrean.dmi rename to icons/inventory/face/mob_nevrean.dmi diff --git a/icons/inventory/face/mob_vr_sergal.dmi b/icons/inventory/face/mob_sergal.dmi similarity index 100% rename from icons/inventory/face/mob_vr_sergal.dmi rename to icons/inventory/face/mob_sergal.dmi diff --git a/icons/inventory/face/mob_tajaran.dmi b/icons/inventory/face/mob_tajaran.dmi index 15f0bf0fe9b..fe7f6443803 100644 Binary files a/icons/inventory/face/mob_tajaran.dmi and b/icons/inventory/face/mob_tajaran.dmi differ diff --git a/icons/inventory/face/mob_teshari.dmi b/icons/inventory/face/mob_teshari.dmi index c8c4004ebd3..6860e54d165 100644 Binary files a/icons/inventory/face/mob_teshari.dmi and b/icons/inventory/face/mob_teshari.dmi differ diff --git a/icons/inventory/face/mob_unathi.dmi b/icons/inventory/face/mob_unathi.dmi index 257f67a3224..21cfc40e26c 100644 Binary files a/icons/inventory/face/mob_unathi.dmi and b/icons/inventory/face/mob_unathi.dmi differ diff --git a/icons/inventory/face/mob_vr.dmi b/icons/inventory/face/mob_vr.dmi deleted file mode 100644 index a69d249814e..00000000000 Binary files a/icons/inventory/face/mob_vr.dmi and /dev/null differ diff --git a/icons/inventory/face/mob_vr_tajaran.dmi b/icons/inventory/face/mob_vr_tajaran.dmi deleted file mode 100644 index 3a8a5b77b05..00000000000 Binary files a/icons/inventory/face/mob_vr_tajaran.dmi and /dev/null differ diff --git a/icons/inventory/face/mob_vr_teshari.dmi b/icons/inventory/face/mob_vr_teshari.dmi deleted file mode 100644 index 4bf3353c7a7..00000000000 Binary files a/icons/inventory/face/mob_vr_teshari.dmi and /dev/null differ diff --git a/icons/inventory/face/mob_vr_unathi.dmi b/icons/inventory/face/mob_vr_unathi.dmi deleted file mode 100644 index d2140d8897a..00000000000 Binary files a/icons/inventory/face/mob_vr_unathi.dmi and /dev/null differ diff --git a/icons/inventory/face/mob_vr_vulpkanin.dmi b/icons/inventory/face/mob_vulpkanin.dmi similarity index 100% rename from icons/inventory/face/mob_vr_vulpkanin.dmi rename to icons/inventory/face/mob_vulpkanin.dmi diff --git a/icons/inventory/face/mob_vr_werebeast.dmi b/icons/inventory/face/mob_werebeast.dmi similarity index 100% rename from icons/inventory/face/mob_vr_werebeast.dmi rename to icons/inventory/face/mob_werebeast.dmi