diff --git a/code/modules/clothing/accessories/rings.dm b/code/modules/clothing/accessories/rings.dm index 58ffedd1d1..6f1183332c 100644 --- a/code/modules/clothing/accessories/rings.dm +++ b/code/modules/clothing/accessories/rings.dm @@ -114,6 +114,7 @@ /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.dmi' icon_state = "wedring_g" item_state = "wedring_g" var/partnername = "" diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index 383d76a50f..6b1761bed3 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -26,7 +26,7 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/hands/mob_teshari.dmi', SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi', - SPECIES_WEREBEAST = 'icons/inventory/hands/mob_vr_werebeast.dmi') + SPECIES_WEREBEAST = 'icons/inventory/hands/mob_werebeast.dmi') /obj/item/clothing/ears sprite_sheets = list( diff --git a/code/modules/clothing/gloves/arm_guards_vr.dm b/code/modules/clothing/gloves/arm_guards_vr.dm index 092eccb0bb..52d5e61101 100644 --- a/code/modules/clothing/gloves/arm_guards_vr.dm +++ b/code/modules/clothing/gloves/arm_guards_vr.dm @@ -2,5 +2,5 @@ name = "imperial gauntlets" desc = "Made of some exotic metal, and crafted by space elves. Elves have delicate hands." icon_state = "ge_gloves" - icon = 'icons/inventory/hands/item_vr.dmi' - icon = 'icons/inventory/hands/mob_vr.dmi' + icon = 'icons/inventory/hands/item.dmi' + icon = 'icons/inventory/hands/mob.dmi' diff --git a/code/modules/clothing/gloves/miscellaneous_vr.dm b/code/modules/clothing/gloves/miscellaneous_vr.dm index ed032d41b2..894f348439 100644 --- a/code/modules/clothing/gloves/miscellaneous_vr.dm +++ b/code/modules/clothing/gloves/miscellaneous_vr.dm @@ -1,7 +1,6 @@ /obj/item/clothing/gloves/weddingring 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 = "" @@ -67,12 +66,10 @@ permeability_coefficient = 0.05 flags = THICKMATERIAL armor = list(melee = 10, bullet = 10, laser = 10, energy = 5, bomb = 0, bio = 30, rad = 30) - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/hands/mob_vr_teshari.dmi', - SPECIES_VOX = 'icons/inventory/hands/mob_vr_vox.dmi', - SPECIES_WEREBEAST = 'icons/inventory/hands/mob_vr_werebeast.dmi') + SPECIES_TESHARI = 'icons/inventory/hands/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/hands/mob_werebeast.dmi') heat_protection = HANDS|ARMS cold_protection = HANDS|ARMS diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 87f4079a0b..958822f4d3 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -326,8 +326,6 @@ sprite_sheets = null /obj/item/clothing/gloves/gauntlets/rig/focalpoint - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' icon_state = "techno_rig" siemens_coefficient = 0 // No animal people sprites for these yet, sad times @@ -384,8 +382,6 @@ sprite_sheets = null /obj/item/clothing/gloves/gauntlets/rig/hephaestus - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' icon_state = "ihs_rig" // No animal people sprites for these yet, sad times species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) @@ -493,8 +489,6 @@ sprite_sheets_obj = null /obj/item/clothing/gloves/gauntlets/rig/baymed - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' icon_state = "medical_rig_bay" item_state = null sprite_sheets = null @@ -557,8 +551,6 @@ sprite_sheets_obj = null /obj/item/clothing/gloves/gauntlets/rig/bayeng - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' icon_state = "engineering_rig_bay" item_state = null sprite_sheets = null @@ -619,8 +611,6 @@ sprite_sheets_obj = null /obj/item/clothing/gloves/gauntlets/rig/pathfinder - icon = 'icons/inventory/hands/item_vr.dmi' - default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' icon_state = "pathfinder_rig_bay" item_state = null sprite_sheets = null diff --git a/icons/inventory/hands/item.dmi b/icons/inventory/hands/item.dmi index 7e5db4cadc..de8231af62 100644 Binary files a/icons/inventory/hands/item.dmi and b/icons/inventory/hands/item.dmi differ diff --git a/icons/inventory/hands/item_vr.dmi b/icons/inventory/hands/item_vr.dmi deleted file mode 100644 index 302f4be618..0000000000 Binary files a/icons/inventory/hands/item_vr.dmi and /dev/null differ diff --git a/icons/inventory/hands/mob.dmi b/icons/inventory/hands/mob.dmi index ab825c3513..03fea15c42 100644 Binary files a/icons/inventory/hands/mob.dmi and b/icons/inventory/hands/mob.dmi differ diff --git a/icons/inventory/hands/mob_teshari.dmi b/icons/inventory/hands/mob_teshari.dmi index 3bd28112cb..a4035817ef 100644 Binary files a/icons/inventory/hands/mob_teshari.dmi and b/icons/inventory/hands/mob_teshari.dmi differ diff --git a/icons/inventory/hands/mob_vox.dmi b/icons/inventory/hands/mob_vox.dmi index 936dbc337a..3a4daa2049 100644 Binary files a/icons/inventory/hands/mob_vox.dmi and b/icons/inventory/hands/mob_vox.dmi differ diff --git a/icons/inventory/hands/mob_vr_teshari.dmi b/icons/inventory/hands/mob_vr_teshari.dmi deleted file mode 100644 index 2d79a8ac14..0000000000 Binary files a/icons/inventory/hands/mob_vr_teshari.dmi and /dev/null differ diff --git a/icons/inventory/hands/mob_vr_vox.dmi b/icons/inventory/hands/mob_vr_vox.dmi deleted file mode 100644 index 405ce4b76f..0000000000 Binary files a/icons/inventory/hands/mob_vr_vox.dmi and /dev/null differ diff --git a/icons/inventory/hands/mob_vr_werebeast.dmi b/icons/inventory/hands/mob_werebeast.dmi similarity index 100% rename from icons/inventory/hands/mob_vr_werebeast.dmi rename to icons/inventory/hands/mob_werebeast.dmi