From c072f96104b6ac05bce5847db0bf29696b76dbf9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 28 Mar 2021 16:20:09 -0400 Subject: [PATCH] Compatibility Fixes --- code/datums/supplypacks/costumes_vr.dm | 190 +++++++++--------- code/game/machinery/vending_machines_vr.dm | 10 +- .../objects/items/devices/radio/headset_vr.dm | 2 +- .../items/weapons/storage/backpack_vr.dm | 2 +- .../objects/items/weapons/storage/belt_vr.dm | 2 +- code/modules/clothing/clothing_vr.dm | 14 +- code/modules/clothing/glasses/glasses_vr.dm | 2 +- .../clothing/spacesuits/rig/rig_pieces_vr.dm | 4 +- .../clothing/spacesuits/void/void_vr.dm | 12 +- code/modules/clothing/suits/utility_vr.dm | 4 +- .../under/accessories/accessory_vr.dm | 4 +- code/modules/mob/language/station_vr.dm | 2 +- .../human/species/station/station_vr.dm | 4 +- code/modules/pda/pda.dm | 4 +- .../vore/fluffstuff/custom_clothes_vr.dm | 2 +- .../{r_seromi_vr.dmi => r_teshari_vr.dmi} | Bin .../species/{seromi => teshari}/helmet_vr.dmi | Bin .../species/{seromi => teshari}/masks_vr.dmi | Bin .../species/{seromi => teshari}/suit_vr.dmi | Bin .../species/{seromi => teshari}/ties_vr.dmi | Bin 20 files changed, 129 insertions(+), 129 deletions(-) rename icons/mob/human_races/{r_seromi_vr.dmi => r_teshari_vr.dmi} (100%) rename icons/mob/species/{seromi => teshari}/helmet_vr.dmi (100%) rename icons/mob/species/{seromi => teshari}/masks_vr.dmi (100%) rename icons/mob/species/{seromi => teshari}/suit_vr.dmi (100%) rename icons/mob/species/{seromi => teshari}/ties_vr.dmi (100%) diff --git a/code/datums/supplypacks/costumes_vr.dm b/code/datums/supplypacks/costumes_vr.dm index e31fb2415a4..5d65a98ca9d 100644 --- a/code/datums/supplypacks/costumes_vr.dm +++ b/code/datums/supplypacks/costumes_vr.dm @@ -23,16 +23,16 @@ name = "Teshari smocks" num_contained = 4 contains = list( - /obj/item/clothing/under/seromi/smock, - /obj/item/clothing/under/seromi/smock/white, - /obj/item/clothing/under/seromi/smock/red, - /obj/item/clothing/under/seromi/smock/yellow, - /obj/item/clothing/under/seromi/smock/rainbow, - /obj/item/clothing/under/seromi/smock/dress, - /obj/item/clothing/under/seromi/smock/blackutilitysmock, - /obj/item/clothing/under/seromi/smock/greydress, - /obj/item/clothing/under/seromi/smock/blackutility, - /obj/item/clothing/under/seromi/smock/bluegreydress + /obj/item/clothing/under/teshari/smock, + /obj/item/clothing/under/teshari/smock/white, + /obj/item/clothing/under/teshari/smock/red, + /obj/item/clothing/under/teshari/smock/yellow, + /obj/item/clothing/under/teshari/smock/rainbow, + /obj/item/clothing/under/teshari/smock/dress, + /obj/item/clothing/under/teshari/smock/blackutilitysmock, + /obj/item/clothing/under/teshari/smock/greydress, + /obj/item/clothing/under/teshari/smock/blackutility, + /obj/item/clothing/under/teshari/smock/bluegreydress ) cost = 20 containertype = /obj/structure/closet/crate @@ -42,18 +42,18 @@ name = "Teshari undercoats" num_contained = 4 contains = list( - /obj/item/clothing/under/seromi/undercoat/standard/orange_grey, - /obj/item/clothing/under/seromi/undercoat/standard/rainbow, - /obj/item/clothing/under/seromi/undercoat/standard/lightgrey_grey, - /obj/item/clothing/under/seromi/undercoat/standard/white_grey, - /obj/item/clothing/under/seromi/undercoat/standard/red_grey, - /obj/item/clothing/under/seromi/undercoat/standard/orange, - /obj/item/clothing/under/seromi/undercoat/standard/yellow_grey, - /obj/item/clothing/under/seromi/undercoat/standard/green_grey, - /obj/item/clothing/under/seromi/undercoat/standard/blue_grey, - /obj/item/clothing/under/seromi/undercoat/standard/purple_grey, - /obj/item/clothing/under/seromi/undercoat/standard/pink_grey, - /obj/item/clothing/under/seromi/undercoat/standard/brown_grey + /obj/item/clothing/under/teshari/undercoat/standard/orange_grey, + /obj/item/clothing/under/teshari/undercoat/standard/rainbow, + /obj/item/clothing/under/teshari/undercoat/standard/lightgrey_grey, + /obj/item/clothing/under/teshari/undercoat/standard/white_grey, + /obj/item/clothing/under/teshari/undercoat/standard/red_grey, + /obj/item/clothing/under/teshari/undercoat/standard/orange, + /obj/item/clothing/under/teshari/undercoat/standard/yellow_grey, + /obj/item/clothing/under/teshari/undercoat/standard/green_grey, + /obj/item/clothing/under/teshari/undercoat/standard/blue_grey, + /obj/item/clothing/under/teshari/undercoat/standard/purple_grey, + /obj/item/clothing/under/teshari/undercoat/standard/pink_grey, + /obj/item/clothing/under/teshari/undercoat/standard/brown_grey ) cost = 20 containertype = /obj/structure/closet/crate @@ -63,18 +63,18 @@ name = "Teshari undercoats (black)" num_contained = 4 contains = list( - /obj/item/clothing/under/seromi/undercoat, - /obj/item/clothing/under/seromi/undercoat/standard/black_orange, - /obj/item/clothing/under/seromi/undercoat/standard/black_grey, - /obj/item/clothing/under/seromi/undercoat/standard/black_white, - /obj/item/clothing/under/seromi/undercoat/standard/black_red, - /obj/item/clothing/under/seromi/undercoat/standard/black, - /obj/item/clothing/under/seromi/undercoat/standard/black_yellow, - /obj/item/clothing/under/seromi/undercoat/standard/black_green, - /obj/item/clothing/under/seromi/undercoat/standard/black_blue, - /obj/item/clothing/under/seromi/undercoat/standard/black_purple, - /obj/item/clothing/under/seromi/undercoat/standard/black_pink, - /obj/item/clothing/under/seromi/undercoat/standard/black_brown + /obj/item/clothing/under/teshari/undercoat, + /obj/item/clothing/under/teshari/undercoat/standard/black_orange, + /obj/item/clothing/under/teshari/undercoat/standard/black_grey, + /obj/item/clothing/under/teshari/undercoat/standard/black_white, + /obj/item/clothing/under/teshari/undercoat/standard/black_red, + /obj/item/clothing/under/teshari/undercoat/standard/black, + /obj/item/clothing/under/teshari/undercoat/standard/black_yellow, + /obj/item/clothing/under/teshari/undercoat/standard/black_green, + /obj/item/clothing/under/teshari/undercoat/standard/black_blue, + /obj/item/clothing/under/teshari/undercoat/standard/black_purple, + /obj/item/clothing/under/teshari/undercoat/standard/black_pink, + /obj/item/clothing/under/teshari/undercoat/standard/black_brown ) cost = 20 containertype = /obj/structure/closet/crate @@ -84,18 +84,18 @@ name = "Teshari cloaks" num_contained = 4 contains = list( - /obj/item/clothing/suit/storage/seromi/cloak/standard/white, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/red_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/orange_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/yellow_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/green_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/blue_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/purple_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/pink_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/brown_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/rainbow, - /obj/item/clothing/suit/storage/seromi/cloak/standard/orange + /obj/item/clothing/suit/storage/teshari/cloak/standard/white, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/red_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/orange_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/yellow_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/green_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/blue_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/purple_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/pink_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/brown_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/rainbow, + /obj/item/clothing/suit/storage/teshari/cloak/standard/orange ) cost = 40 containertype = /obj/structure/closet/crate @@ -105,19 +105,19 @@ name = "Teshari cloaks (black)" num_contained = 4 contains = list( - /obj/item/clothing/suit/storage/seromi/cloak, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_red, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_orange, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_yellow, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_green, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_blue, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_purple, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_pink, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_brown, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_white, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_glow, - /obj/item/clothing/suit/storage/seromi/cloak/standard/dark_retrowave + /obj/item/clothing/suit/storage/teshari/cloak, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_red, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_orange, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_yellow, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_green, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_blue, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_purple, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_pink, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_brown, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_white, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_glow, + /obj/item/clothing/suit/storage/teshari/cloak/standard/dark_retrowave ) cost = 40 containertype = /obj/structure/closet/crate @@ -127,16 +127,16 @@ name = "Teshari worksuits" num_contained = 4 contains = list( - /obj/item/clothing/under/seromi/undercoat/standard/worksuit, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackpurple, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackorange, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackblue, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackgreen, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitered, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitepurple, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whiteorange, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whiteblue, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitegreen + /obj/item/clothing/under/teshari/undercoat/standard/worksuit, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackpurple, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackorange, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackblue, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackgreen, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitered, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitepurple, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteorange, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteblue, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitegreen ) cost = 20 containertype = /obj/structure/closet/crate @@ -146,18 +146,18 @@ name = "Teshari cloaks (belted)" num_contained = 4 contains = list( - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/rainbow, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/lightgrey_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/red_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/yellow_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/green_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/blue_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/purple_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/pink_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/brown_grey + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/rainbow, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/lightgrey_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/red_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/yellow_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/green_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/blue_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/purple_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/pink_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/brown_grey ) cost = 40 containertype = /obj/structure/closet/crate @@ -167,20 +167,20 @@ name = "Teshari cloaks (belted, black)" num_contained = 4 contains = list( - /obj/item/clothing/suit/storage/seromi/beltcloak, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_orange, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_midgrey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_lightgrey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_white, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_red, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_yellow, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_green, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_blue, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_purple, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_pink, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_brown + /obj/item/clothing/suit/storage/teshari/beltcloak, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_orange, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_midgrey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_lightgrey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_white, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_red, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_yellow, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_green, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_blue, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_purple, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_pink, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_brown ) cost = 40 containertype = /obj/structure/closet/crate diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index c4c4e663d4b..5f30171a8d9 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -1175,7 +1175,7 @@ /obj/item/clothing/suit/varsity/blue = 5, /obj/item/clothing/suit/varsity/brown = 5, /obj/item/clothing/suit/storage/hooded/wintercoat = 5, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 5) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) prices = list(/obj/item/clothing/suit/storage/apron = 100, /obj/item/clothing/suit/storage/flannel/aqua = 100, /obj/item/clothing/suit/storage/toggle/bomber = 100, @@ -1262,7 +1262,7 @@ /obj/item/clothing/suit/varsity/blue = 100, /obj/item/clothing/suit/varsity/brown = 100, /obj/item/clothing/suit/storage/hooded/wintercoat = 100, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 100) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) premium = list(/obj/item/clothing/suit/imperium_monk = 3) contraband = list(/obj/item/toy/katana = 1) @@ -2536,7 +2536,7 @@ /obj/item/clothing/suit/varsity/blue = 5, /obj/item/clothing/suit/varsity/brown = 5, /obj/item/clothing/suit/storage/hooded/wintercoat = 5, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 5) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) prices = list(/obj/item/clothing/suit/storage/apron = 100, /obj/item/clothing/suit/storage/flannel/aqua = 100, /obj/item/clothing/suit/storage/toggle/bomber = 100, @@ -2623,7 +2623,7 @@ /obj/item/clothing/suit/varsity/blue = 100, /obj/item/clothing/suit/varsity/brown = 100, /obj/item/clothing/suit/storage/hooded/wintercoat = 100, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 100) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) premium = list(/obj/item/clothing/suit/imperium_monk = 3) contraband = list(/obj/item/toy/katana = 1) @@ -3520,7 +3520,7 @@ /obj/item/clothing/suit/varsity/blue = 5, /obj/item/clothing/suit/varsity/brown = 5, /obj/item/clothing/suit/storage/hooded/wintercoat = 5, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 5, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5, /obj/item/clothing/suit/imperium_monk = 3, /obj/item/clothing/head/helmet/space/void/engineering = 5, /obj/item/clothing/suit/space/void/engineering = 5, diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index 2682d9db97c..8285fade758 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -22,7 +22,7 @@ icon_state = "nt_headset_alt" /obj/item/device/radio/headset - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi', + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/ears.dmi') /obj/item/device/radio/headset/mob_headset //Adminbus headset for simplemob shenanigans. diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index c201dd5c72e..ab83c877527 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -77,7 +77,7 @@ /obj/item/weapon/storage/backpack sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/back.dmi') /obj/item/weapon/storage/backpack/ert diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index e726e30b9cf..defdcc296b0 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -1,6 +1,6 @@ /obj/item/weapon/storage/belt sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/belt.dmi') /obj/item/weapon/storage/belt/explorer diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index e5b1649fa57..11116baa8ee 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -5,7 +5,7 @@ var/list/inside_emotes = list() var/recent_squish = 0 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/shoes.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi', SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/feet.dmi') @@ -85,13 +85,13 @@ /obj/item/clothing/gloves sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/gloves.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi', SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/hands.dmi') /obj/item/clothing/ears sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/ears.dmi') /obj/item/clothing/relaymove(var/mob/living/user,var/direction) @@ -131,7 +131,7 @@ slot_wear_mask_str = 'icons/mob/mask_vr.dmi' ) sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/masks_vr.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/masks_vr.dmi', SPECIES_VOX = 'icons/mob/species/vox/masks.dmi', SPECIES_TAJ = 'icons/mob/species/tajaran/mask_vr.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/mask_vr.dmi', @@ -149,7 +149,7 @@ //Switch to taur sprites if a taur equips /obj/item/clothing/suit sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi') @@ -158,7 +158,7 @@ sensor_mode = 3 var/sensorpref = 5 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/uniform.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/uniform.dmi', SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/uniform.dmi') @@ -178,6 +178,6 @@ /obj/item/clothing/head sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi') diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index 7cef44b83c8..4471f3d9c51 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -125,7 +125,7 @@ /obj/item/clothing/glasses sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/eyes.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi', SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi' ) diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm index 6157dca2558..1d211e0bf15 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm @@ -12,7 +12,7 @@ SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi', SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi' ) @@ -31,7 +31,7 @@ SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi', SPECIES_PROMETHEAN = 'icons/mob/species/skrell/suit.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' ) /obj/item/clothing/head/helmet/space/rig diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index d1c8d16f3a4..4c21007a8b2 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -11,7 +11,7 @@ SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi', SPECIES_AKULA = 'icons/mob/species/akula/helmet_vr.dmi', SPECIES_SERGAL = 'icons/mob/species/sergal/helmet_vr.dmi', @@ -24,7 +24,7 @@ SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi', // Copied from void.dm SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi', // Copied from void.dm SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi', // Copied from void.dm - SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/hats.dmi', // Copied from void.dm + SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/hats.dmi', // Copied from void.dm SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/hats.dmi', SPECIES_AKULA = 'icons/obj/clothing/species/akula/hats.dmi', SPECIES_SERGAL = 'icons/obj/clothing/species/sergal/hats.dmi', @@ -40,7 +40,7 @@ SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi', SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi', SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi', @@ -53,7 +53,7 @@ SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi', // Copied from void.dm SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi', // Copied from void.dm SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi', // Copied from void.dm - SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/suits.dmi', // Copied from void.dm + SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/suits.dmi', // Copied from void.dm SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/suits.dmi', SPECIES_AKULA = 'icons/obj/clothing/species/akula/suits.dmi', SPECIES_SERGAL = 'icons/obj/clothing/species/sergal/suits.dmi', @@ -163,7 +163,7 @@ SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit_vr.dmi', SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit_vr.dmi', SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/suit_vr.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/suit_vr.dmi' ) sprite_sheets_obj = list( SPECIES_TAJ = 'icons/obj/clothing/suits_vr.dmi', @@ -242,7 +242,7 @@ SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet_vr.dmi', SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet_vr.dmi', SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/helmet_vr.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi' ) sprite_sheets_obj = list( SPECIES_TAJ = 'icons/obj/clothing/hats_vr.dmi', diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index e225a53eee3..529547469b0 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -19,14 +19,14 @@ /obj/item/clothing/head/radiation sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/helmet_vr.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi' ) /obj/item/clothing/suit/radiation sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/suit_vr.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/suit_vr.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi' ) diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 2d241bf3b5d..85c28047585 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -14,7 +14,7 @@ var/customized = 0 var/icon_previous_override sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/ties_vr.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/ties_vr.dmi' ) //Forces different sprite sheet on equip @@ -64,7 +64,7 @@ var/writtenon = 0 var/icon_previous_override sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/ties_vr.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/ties_vr.dmi' ) //Forces different sprite sheet on equip diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 5775d3b5968..66745ca9169 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -155,7 +155,7 @@ flags = 0 /datum/language/skrell flags = 0 -/datum/language/seromi +/datum/language/teshari flags = 0 /datum/language/zaddat flags = 0 diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 3b155a08ee7..f87f0de9dd7 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -310,8 +310,8 @@ /datum/species/teshari mob_size = MOB_MEDIUM //To allow normal mob swapping spawn_flags = SPECIES_CAN_JOIN - icobase = 'icons/mob/human_races/r_seromi_vr.dmi' - deform = 'icons/mob/human_races/r_seromi_vr.dmi' + icobase = 'icons/mob/human_races/r_teshari_vr.dmi' + deform = 'icons/mob/human_races/r_teshari_vr.dmi' icobase_tail = 1 color_mult = 1 min_age = 18 diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index 09190cd5933..298e8efd135 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -139,8 +139,8 @@ var/global/list/obj/item/device/pda/PDAs = list() desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a wrist-bound version." slot_flags = SLOT_ID | SLOT_BELT | SLOT_GLOVES sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', - SPECIES_VR_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi', + SPECIES_VR_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi', ) else icon = 'icons/obj/pda_old.dmi' diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 78af3b90441..2c3ac9641b4 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -1716,7 +1716,7 @@ Departamental Swimsuits, for general use item_state = "latexmaid_mob" sprite_sheets = list( - "Teshari" = 'icons/vore/custom_clothes_tesh_vr.dmi' + SPECIES_TESHARI = 'icons/vore/custom_clothes_tesh_vr.dmi' ) body_parts_covered = UPPER_TORSO|LOWER_TORSO diff --git a/icons/mob/human_races/r_seromi_vr.dmi b/icons/mob/human_races/r_teshari_vr.dmi similarity index 100% rename from icons/mob/human_races/r_seromi_vr.dmi rename to icons/mob/human_races/r_teshari_vr.dmi diff --git a/icons/mob/species/seromi/helmet_vr.dmi b/icons/mob/species/teshari/helmet_vr.dmi similarity index 100% rename from icons/mob/species/seromi/helmet_vr.dmi rename to icons/mob/species/teshari/helmet_vr.dmi diff --git a/icons/mob/species/seromi/masks_vr.dmi b/icons/mob/species/teshari/masks_vr.dmi similarity index 100% rename from icons/mob/species/seromi/masks_vr.dmi rename to icons/mob/species/teshari/masks_vr.dmi diff --git a/icons/mob/species/seromi/suit_vr.dmi b/icons/mob/species/teshari/suit_vr.dmi similarity index 100% rename from icons/mob/species/seromi/suit_vr.dmi rename to icons/mob/species/teshari/suit_vr.dmi diff --git a/icons/mob/species/seromi/ties_vr.dmi b/icons/mob/species/teshari/ties_vr.dmi similarity index 100% rename from icons/mob/species/seromi/ties_vr.dmi rename to icons/mob/species/teshari/ties_vr.dmi