diff --git a/code/modules/clothing/accessories/accessory_vr.dm b/code/modules/clothing/accessories/accessory_vr.dm index 4c87c7fbc2e..a7515a9a731 100644 --- a/code/modules/clothing/accessories/accessory_vr.dm +++ b/code/modules/clothing/accessories/accessory_vr.dm @@ -6,16 +6,11 @@ name = "plain choker" slot_flags = SLOT_TIE | SLOT_OCLOTHING desc = "A simple, plain choker. Or maybe it's a collar?" - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "choker_cst" item_state = "choker_cst" overlay_state = "choker_cst" var/customized = 0 var/icon_previous_override - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/accessory/mob_vr_teshari.dmi' - ) //Forces different sprite sheet on equip /obj/item/clothing/accessory/choker/Initialize(mapload) @@ -47,14 +42,9 @@ /obj/item/clothing/accessory/collar slot_flags = SLOT_TIE | SLOT_OCLOTHING - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "collar_blk" var/writtenon = 0 var/icon_previous_override - sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/accessory/mob_vr_teshari.dmi' - ) //Forces different sprite sheet on equip /obj/item/clothing/accessory/collar/Initialize(mapload) @@ -611,8 +601,6 @@ desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat." /obj/item/clothing/accessory/medal/silver/unity/tabiranth - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "silverthree" item_state = "silverthree" overlay_state = "silverthree" @@ -621,8 +609,6 @@ /obj/item/clothing/accessory/talon name = "Talon pin" desc = "A collectable enamel pin that resembles ITV Talon's ship logo." - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "talon_pin" item_state = "talonpin" overlay_state = "talonpin" @@ -658,8 +644,6 @@ /obj/item/clothing/accessory/qipaogold name = "gold trim" desc = "Gold trim belonging to a qipao. Why would you remove this?" - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "qipaogold" item_state = "qipaogold" overlay_state = "qipaogold" @@ -668,8 +652,6 @@ /obj/item/clothing/accessory/antediluvian name = "antediluvian bracers" desc = "A pair of metal bracers with gold inlay. They're thin and light." - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "antediluvian" item_state = "antediluvian" overlay_state = "antediluvian" @@ -1004,8 +986,6 @@ /obj/item/clothing/accessory/belt name = "Thin Belt" desc = "A thin belt for holding your pants up." - icon = 'icons/inventory/accessory/item.dmi' - icon_override = 'icons/inventory/accessory/mob.dmi' icon_state = "belt_thin" item_state = "belt_thin" slot_flags = SLOT_TIE | SLOT_BELT @@ -1032,8 +1012,6 @@ /obj/item/clothing/accessory/bunny_tail name = "Bunny Tail" desc = "A little fluffy bunny tail to spice up your outfit." - icon = 'icons/inventory/accessory/item.dmi' - icon_override = 'icons/inventory/accessory/mob.dmi' icon_state = "bunny_tail" item_state = "bunny_tail" slot_flags = SLOT_TIE | SLOT_BELT diff --git a/code/modules/clothing/accessories/altevian_vr.dm b/code/modules/clothing/accessories/altevian_vr.dm index 3a7ca8c7850..d326c920de6 100644 --- a/code/modules/clothing/accessories/altevian_vr.dm +++ b/code/modules/clothing/accessories/altevian_vr.dm @@ -1,8 +1,6 @@ /obj/item/clothing/accessory/jacket/altevian name = "Altevian Hegemony Civilian Jacket" desc = "A form fitting half-jacket that leaves ones body exposed to the elements. This attire is great for those summer days, or if you're someone that runs a high internal temperature." - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "altevian-jacket-civ" item_state = "altevian-jacket-civ" overlay_state = "altevian-jacket-civ" @@ -47,8 +45,6 @@ /obj/item/clothing/accessory/scarf/altevian name = "Blue Comfortable Scarf" desc = "A soft silk like scarf made of synthetic material. It's soft to the touch." - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "altevian-scarf-blue" item_state = "altevian-scarf-blue" overlay_state = "altevian-scarf-blue" diff --git a/code/modules/clothing/accessories/badges_vr.dm b/code/modules/clothing/accessories/badges_vr.dm index 005f994e2de..808cc062216 100644 --- a/code/modules/clothing/accessories/badges_vr.dm +++ b/code/modules/clothing/accessories/badges_vr.dm @@ -3,8 +3,6 @@ desc = "A small device used to measure body radiation and warning one after a certain threshold. \ Read manual before use! Can be held, attached to the uniform or worn around the neck." w_class = ITEMSIZE_SMALL - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/item_vr.dmi' icon_state = "dosimeter" item_state = "dosimeter" overlay_state = "dosimeter" @@ -83,8 +81,6 @@ name = "dosimeter film" desc = "These films can be inserted into dosimeters. It turns from white to black, depending on how much radiation it endured." w_class = ITEMSIZE_SMALL - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/item_vr.dmi' icon_state = "dosimeter_film0" var/state = 0 //0 - White, 1 - Darker, 2 - Black (same as iconstates) @@ -110,8 +106,6 @@ /obj/item/storage/box/dosimeter name = "dosimeter case" desc = "This case can only hold the Dosimeter, a few films and a manual." - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/item_vr.dmi' icon_state = "dosimeter_case" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") storage_slots = 5 diff --git a/code/modules/clothing/accessories/clothing_vr.dm b/code/modules/clothing/accessories/clothing_vr.dm index 5cc4bd5eb5e..a9ab8c4d615 100644 --- a/code/modules/clothing/accessories/clothing_vr.dm +++ b/code/modules/clothing/accessories/clothing_vr.dm @@ -1,8 +1,6 @@ /obj/item/clothing/accessory/jacket/modwrap name = "modern wrapped coat (coat)" desc = "The cutting edge of fashion." - icon = 'icons/inventory/accessory/item_vr.dmi' - icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "mod_coat" item_state = "mod_coat" overlay_state = "mod_coat" diff --git a/code/modules/clothing/accessories/holster_vr.dm b/code/modules/clothing/accessories/holster_vr.dm index 0836f79592f..4cebfdda028 100644 --- a/code/modules/clothing/accessories/holster_vr.dm +++ b/code/modules/clothing/accessories/holster_vr.dm @@ -17,11 +17,9 @@ /obj/item/clothing/accessory/holster/machete/rapier name = "rapier sheath" desc = "A beautiful red sheath, probably for a beautiful blade." - icon = 'icons/inventory/accessory/item_vr.dmi' icon_state = "sheath" slot_flags = SLOT_BELT|ACCESSORY_SLOT_WEAPON var/has_full_icon = 1 - icon_override = 'icons/inventory/accessory/mob_vr.dmi' overlay_state = "sheath" can_hold = list(/obj/item/melee/rapier) diff --git a/code/modules/clothing/accessories/rings.dm b/code/modules/clothing/accessories/rings.dm index 2745af67923..58ffedd1d1e 100644 --- a/code/modules/clothing/accessories/rings.dm +++ b/code/modules/clothing/accessories/rings.dm @@ -114,7 +114,6 @@ /obj/item/clothing/accessory/ring/wedding name = "golden wedding ring" desc = "For showing your devotion to another person. It has a golden glimmer to it." - icon = 'icons/inventory/hands/item_vr.dmi' icon_state = "wedring_g" item_state = "wedring_g" var/partnername = "" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index ff075bc2880..e9a28fbd37c 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -119,7 +119,7 @@ /obj/item/clothing/gloves/bluespace name = "size standardization bracelet" desc = "A somewhat bulky metal bracelet featuring a crystal, glowing blue. The outer side of the bracelet has an elongated case that one might imagine contains electronic components. This bracelet is used to standardize the size of crewmembers who may need a non-permanent size assist." - icon = 'icons/inventory/accessory/item_vr.dmi' + icon = 'icons/inventory/accessory/item.dmi' icon_state = "bs_bracelet" w_class = ITEMSIZE_TINY glove_level = 1 diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index d173d5829cb..fcd323815ca 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/item_vr.dmi b/icons/inventory/accessory/item_vr.dmi deleted file mode 100644 index 5a85d7bb33a..00000000000 Binary files a/icons/inventory/accessory/item_vr.dmi and /dev/null differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index 3d8ca2b51e0..1f214dd2f0b 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/accessory/mob_teshari.dmi b/icons/inventory/accessory/mob_teshari.dmi index 820e5b5f6d1..aaa821ea33f 100644 Binary files a/icons/inventory/accessory/mob_teshari.dmi and b/icons/inventory/accessory/mob_teshari.dmi differ diff --git a/icons/inventory/accessory/mob_vr.dmi b/icons/inventory/accessory/mob_vr.dmi deleted file mode 100644 index f3509128a77..00000000000 Binary files a/icons/inventory/accessory/mob_vr.dmi and /dev/null differ diff --git a/icons/inventory/accessory/mob_vr_teshari.dmi b/icons/inventory/accessory/mob_vr_teshari.dmi deleted file mode 100644 index 45e62b93258..00000000000 Binary files a/icons/inventory/accessory/mob_vr_teshari.dmi and /dev/null differ diff --git a/icons/inventory/accessory/mob_vr_werebeast.dmi b/icons/inventory/accessory/mob_werebeast.dmi similarity index 100% rename from icons/inventory/accessory/mob_vr_werebeast.dmi rename to icons/inventory/accessory/mob_werebeast.dmi diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm index dc8be8df43e..816e6994359 100644 --- a/maps/redgate/fantasy_items.dm +++ b/maps/redgate/fantasy_items.dm @@ -397,7 +397,7 @@ /obj/item/clothing/gloves/bluespace/magic name = "bracer of resilience" desc = "A bracer that is said to make one resistent to size changing magic." - icon = 'icons/inventory/accessory/item_vr.dmi' + icon = 'icons/inventory/accessory/item.dmi' icon_state = "bs_magic" //harpoon