diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index ade7584a33..68699342a4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -57,4 +57,4 @@ /datum/gear/eyes/medical/medpatch display_name = "Health HUDpatch" - path = /obj/item/clothing/glasses/hud/health/eyepatch \ No newline at end of file + path = /obj/item/clothing/glasses/hud/health/eyepatch diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 5e2ffdac50..1d95fef5f4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -379,6 +379,7 @@ /datum/gear/suit/cloakcolor/New() ..() gear_tweaks += gear_tweak_free_color_choice + /datum/gear/suit/labcoat_tesh display_name = "labcoat, colorable (Teshari)" path = /obj/item/clothing/suit/storage/toggle/labcoat/teshari @@ -397,7 +398,6 @@ /datum/gear/suit/teshcoat/New() ..() - gear_tweaks += gear_tweak_free_color_choice /datum/gear/suit/teshcoatwhite @@ -424,11 +424,16 @@ display_name = "toe-less jackboots" path = /obj/item/clothing/shoes/boots/jackboots/toeless - /datum/gear/shoes/toelessknee display_name = "toe-less jackboots, knee-length" path = /obj/item/clothing/shoes/boots/jackboots/toeless/knee /datum/gear/shoes/toelessthigh display_name = "toe-less jackboots, thigh-length" - path = /obj/item/clothing/shoes/boots/jackboots/toeless/thigh \ No newline at end of file + path = /obj/item/clothing/shoes/boots/jackboots/toeless/thigh + +/datum/gear/eyes/aerogelgoggles + display_name = "airtight orange goggles (Teshari)" + path = /obj/item/clothing/glasses/aerogelgoggles + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm index 6272e40204..6e7e53f40f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -96,3 +96,385 @@ display_name = "white wedding dress (Wolf/Horse-taur)" path = /obj/item/clothing/suit/taur_dress/white sort_category = "Xenowear" + +//Net new alternate job undercoats. +/datum/gear/suit/dept/undercoat/cap + display_name = "facility director undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/cap_vr + allowed_roles = list("Site Manager") + +/datum/gear/suit/dept/undercoat/psych + display_name = "psychiatrist undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/psych_vr + allowed_roles = list("Psychiatrist") + +/datum/gear/suit/dept/undercoat/rd + display_name = "research director undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/rd_vr + allowed_roles = list("Research Director") + +/datum/gear/suit/dept/undercoat/hos + display_name = "head of security undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/hos_vr + allowed_roles = list("Head of Security") + +/datum/gear/suit/dept/undercoat/hop + display_name = "head of personnel undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/hop_vr + allowed_roles = list("Head of Personnel") + +//Added to allow selection of alternate job undercoats. +./datum/gear/uniform/dept/undercoat/ce/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/qm/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/cmo/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/cargo/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/mining/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/security/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/service/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/engineer/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/atmos/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/research/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/robo/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/medical/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/chemistry/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/virology/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/paramedic/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +/datum/gear/uniform/dept/undercoat/iaa/New() + ..() + var/list/undercoats = list() + for(var/undercoat in typesof(path)) + var/obj/item/clothing/under/seromi/undercoat/jobs/undercoat_type = undercoat + undercoats[initial(undercoat_type.name)] = undercoat_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) + +//Net new alternate cloak sprites. +/datum/gear/suit/cloak_vr + display_name = "cloak selection (Teshari) (VR)" + path = /obj/item/clothing/suit/storage/teshari/cloak_vr/standard + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/cloak_vr/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak_vr/standard)) + var/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/cloak_vr_color + display_name = "cloak, recolorable (Teshari) (VR)" + path = /obj/item/clothing/suit/storage/teshari/cloak_vr/standard/white + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/cloak_vr_color/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +//Net new alternate job cloaks +/datum/gear/suit/dept/cloak/cap + display_name = "facility director cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cap_vr + allowed_roles = list("Site Manager") + +/datum/gear/suit/dept/cloak/psych + display_name = "psychiatrist cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/psych_vr + allowed_roles = list("Psychiatrist") + +/datum/gear/suit/dept/cloak/rd + display_name = "research director cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/rd_vr + allowed_roles = list("Research Director") + +/datum/gear/suit/dept/cloak/hos + display_name = "head of security cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hos_vr + allowed_roles = list("Head of Security") + +/datum/gear/suit/dept/cloak/hop + display_name = "head of personnel cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hop_vr + allowed_roles = list("Head of Personnel") + +//Added to allow selection of alternate job cloaks. +/datum/gear/suit/dept/cloak/ce/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/qm/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/command/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/cmo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/cargo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/mining/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/security/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/service/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/engineer/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/atmos/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/research/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/robo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/medical/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/chemistry/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/virology/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/paramedic/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/iaa/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(path)) + var/obj/item/clothing/suit/storage/seromi/cloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +//Added from CHOMP +/datum/gear/suit/cloak_hood + display_name = "hooded cloak selection (Teshari)" + path = /obj/item/clothing/suit/storage/hooded/teshari/standard + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/cloak_hood/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/beltcloak + display_name = "belted cloak selection (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/beltcloak/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/beltcloak/standard)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/standard/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/beltcloak_color + display_name = "belted cloak, recolorable (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/beltcloak_color/New() + ..() + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 677c7a9943..51f67a4f33 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -544,4 +544,45 @@ BLIND // can't see anything name = "optical thermal implants" desc = "A set of implantable lenses designed to augment your vision" icon_state = "thermalimplants" - item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses") \ No newline at end of file +<<<<<<< HEAD + item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses") +||||||| parent of 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word + item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses") +======= + item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses") + +/obj/item/clothing/glasses/aerogelgoggles + name = "orange goggles" + desc = "Teshari designed lightweight goggles." + icon_state = "orange-g" + item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") + action_button_name = "Adjust Orange Goggles" + var/up = 0 + item_flags = AIRTIGHT + body_parts_covered = EYES + species_restricted = list(SPECIES_TESHARI) + +/obj/item/clothing/glasses/aerogelgoggles/attack_self() + toggle() + +/obj/item/clothing/glasses/aerogelgoggles/verb/toggle() + set category = "Object" + set name = "Adjust Orange Goggles" + set src in usr + + if(usr.canmove && !usr.stat && !usr.restrained()) + if(src.up) + src.up = !src.up + flags_inv |= HIDEEYES + body_parts_covered |= EYES + icon_state = initial(icon_state) + to_chat(usr, "You flip \the [src] down to protect your eyes.") + else + src.up = !src.up + flags_inv &= ~HIDEEYES + body_parts_covered &= ~EYES + icon_state = "[initial(icon_state)]up" + to_chat(usr, "You push \the [src] up from in front of your eyes.") + update_clothing_icon() + usr.update_action_buttons() +>>>>>>> 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index ffbd36d1ee..a4c0840500 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -127,6 +127,14 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/mob/species/seromi/eyes.dmi', SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi', +<<<<<<< HEAD SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi', SPECIES_GREY_YW = 'icons/mob/species/grey/eyes.dmi'/*ywedit*/ - ) \ No newline at end of file + ) +||||||| parent of 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word + SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi' + ) +======= + SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi' + ) +>>>>>>> 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index b7f0281562..1436f3d5cc 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -37,6 +37,9 @@ if(camera_networks) verbs |= /obj/item/clothing/head/helmet/space/proc/toggle_camera + if(type == /obj/item/clothing/head/helmet/space) //VOREStation edit - use the specially refitted sprites by KBraid. Done this way to avoid breaking subtypes. + sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/seromi/helmet_vr.dmi' + /obj/item/clothing/head/helmet/space/proc/toggle_camera() set name = "Toggle Helmet Camera" set desc = "Turn your helmet's camera on or off." @@ -89,6 +92,13 @@ valid_accessory_slots = (ACCESSORY_SLOT_OVER | ACCESSORY_SLOT_ARMBAND | ACCESSORY_SLOT_DECOR) var/list/supporting_limbs //If not-null, automatically splints breaks. Checked when removing the suit. +//VOREStation edit start - use the specially refitted sprites by KBraid. Done this way to avoid breaking subtypes. +/obj/item/clothing/suit/space/Initialize() + . = ..() + if(type == /obj/item/clothing/suit/space) + sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/seromi/suit_vr.dmi' +//VOREStation edit end. + /obj/item/clothing/suit/space/equipped(mob/M) check_limb_support(M) ..() diff --git a/code/modules/clothing/suits/aliens/seromi_vr.dm b/code/modules/clothing/suits/aliens/seromi_vr.dm new file mode 100644 index 0000000000..3019fd4454 --- /dev/null +++ b/code/modules/clothing/suits/aliens/seromi_vr.dm @@ -0,0 +1,830 @@ +//Hooded teshari cloaks +/obj/item/clothing/suit/storage/hooded/teshari + name = "Hooded Teshari Cloak" + desc = "A soft teshari cloak with an added hood." + icon_override = 'icons/mob/species/seromi/teshari_hood_vr.dmi' + icon = 'icons/mob/species/seromi/teshari_hood_vr.dmi' + icon_state = "tesh_hcloak_bo" + item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo") + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER|HIDETIE + //hooded = 1 Variable no longer exists, hood is now handled by code/modules/clothing/suit/storage/hooded.dm + action_button_name = "Toggle Cloak Hood" + hoodtype = /obj/item/clothing/head/tesh_hood + allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) + +/obj/item/clothing/head/tesh_hood + name = "Cloak Hood" + desc = "A hood attached to a teshari cloak." + icon_override = 'icons/mob/species/seromi/teshari_hood_vr.dmi' + icon = 'icons/mob/species/seromi/teshari_hood_vr.dmi' + icon_state = "tesh_hood_bo" + item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo") + flags_inv = BLOCKHAIR + body_parts_covered = HEAD + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_orange + name = "black and orange hooded cloak" + icon_state = "tesh_hcloak_bo" + item_state = "tesh_hcloak_bo" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_orange + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_grey + name = "black and grey hooded cloak" + icon_state = "tesh_hcloak_bg" + item_state = "tesh_hcloak_bg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_midgrey + name = "black and medium grey hooded cloak" + icon_state = "tesh_hcloak_bmg" + item_state = "tesh_hcloak_bmg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_midgrey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_lightgrey + name = "black and light grey hooded cloak" + icon_state = "tesh_hcloak_blg" + item_state = "tesh_hcloak_blg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_lightgrey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_white + name = "black and white hooded cloak" + icon_state = "tesh_hcloak_bw" + item_state = "tesh_hcloak_bw" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_white + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_red + name = "black and red hooded cloak" + icon_state = "tesh_hcloak_br" + item_state = "tesh_hcloak_br" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_red + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black + name = "black hooded cloak" + icon_state = "tesh_hcloak_bn" + item_state = "tesh_hcloak_bn" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_yellow + name = "black and yellow hooded cloak" + icon_state = "tesh_hcloak_by" + item_state = "tesh_hcloak_by" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_yellow + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_green + name = "black and green hooded cloak" + icon_state = "tesh_hcloak_bgr" + item_state = "tesh_hcloak_bgr" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_green + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_blue + name = "black and blue hooded cloak" + icon_state = "tesh_hcloak_bbl" + item_state = "tesh_hcloak_bbl" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_blue + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_purple + name = "black and purple hooded cloak" + icon_state = "tesh_hcloak_bp" + item_state = "tesh_hcloak_bp" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_purple + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_pink + name = "black and pink hooded cloak" + icon_state = "tesh_hcloak_bpi" + item_state = "tesh_hcloak_bpi" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_pink + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_brown + name = "black and brown hooded cloak" + icon_state = "tesh_hcloak_bbr" + item_state = "tesh_hcloak_bbr" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_brown + +/obj/item/clothing/suit/storage/hooded/teshari/standard/orange_grey + name = "orange and grey hooded cloak" + icon_state = "tesh_hcloak_og" + item_state = "tesh_hcloak_og" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/orange_grey + +///obj/item/clothing/suit/storage/hooded/teshari/standard/rainbow +// name = "rainbow hooded cloak" +// icon_state = "tesh_hcloak_rainbow" +// item_state = "tesh_hcloak_rainbow" +// hoodtype = /obj/item/clothing/head/tesh_hood/standard/rainbow + +/obj/item/clothing/suit/storage/hooded/teshari/standard/lightgrey_grey + name = "light grey and grey hooded cloak" + icon_state = "tesh_hcloak_lgg" + item_state = "tesh_hcloak_lgg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/lightgrey_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/white_grey + name = "white and grey hooded cloak" + icon_state = "tesh_hcloak_wg" + item_state = "tesh_hcloak_wg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/white_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/red_grey + name = "red and grey hooded cloak" + icon_state = "tesh_hcloak_rg" + item_state = "tesh_hcloak_rg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/red_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/orange + name = "orange hooded cloak" + icon_state = "tesh_hcloak_on" + item_state = "tesh_hcloak_on" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/orange + +/obj/item/clothing/suit/storage/hooded/teshari/standard/yellow_grey + name = "yellow and grey hooded cloak" + icon_state = "tesh_hcloak_yg" + item_state = "tesh_hcloak_yg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/yellow_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/green_grey + name = "green and grey hooded cloak" + icon_state = "tesh_hcloak_gg" + item_state = "tesh_hcloak_gg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/green_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/blue_grey + name = "blue and grey hooded cloak" + icon_state = "tesh_hcloak_blug" + item_state = "tesh_hcloak_blug" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/blue_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/purple_grey + name = "purple and grey hooded cloak" + icon_state = "tesh_hcloak_pg" + item_state = "tesh_hcloak_pg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/purple_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/pink_grey + name = "pink and grey hooded cloak" + icon_state = "tesh_hcloak_pig" + item_state = "tesh_hcloak_pig" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/pink_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/brown_grey + name = "brown and grey hooded cloak" + icon_state = "tesh_hcloak_brg" + item_state = "tesh_hcloak_brg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/brown_grey + +//The actual hoods +/obj/item/clothing/head/tesh_hood/standard/black_orange + name = "black and orange cloak hood" + icon_state = "tesh_hood_bo" + item_state = "tesh_hood_bo" + +/obj/item/clothing/head/tesh_hood/standard/black_grey + name = "black and grey cloak hood" + icon_state = "tesh_hood_bg" + item_state = "tesh_hood_bg" + +/obj/item/clothing/head/tesh_hood/standard/black_midgrey + name = "black and medium grey cloak hood" + icon_state = "tesh_hood_bmg" + item_state = "tesh_hood_bmg" + +/obj/item/clothing/head/tesh_hood/standard/black_lightgrey + name = "black and light grey cloak hood" + icon_state = "tesh_hood_blg" + item_state = "tesh_hood_blg" + +/obj/item/clothing/head/tesh_hood/standard/black_white + name = "black and white cloak hood" + icon_state = "tesh_hood_bw" + item_state = "tesh_hood_bw" + +/obj/item/clothing/head/tesh_hood/standard/black_red + name = "black and red cloak hood" + icon_state = "tesh_hood_br" + item_state = "tesh_hood_br" + +/obj/item/clothing/head/tesh_hood/standard/black + name = "black cloak hood" + icon_state = "tesh_hood_bn" + item_state = "tesh_hood_bn" + +/obj/item/clothing/head/tesh_hood/standard/black_yellow + name = "black and yellow cloak hood" + icon_state = "tesh_hood_by" + item_state = "tesh_hood_by" + +/obj/item/clothing/head/tesh_hood/standard/black_green + name = "black and green cloak hood" + icon_state = "tesh_hood_bgr" + item_state = "tesh_hood_bgr" + +/obj/item/clothing/head/tesh_hood/standard/black_blue + name = "black and blue cloak hood" + icon_state = "tesh_hood_bbl" + item_state = "tesh_hood_bbl" + +/obj/item/clothing/head/tesh_hood/standard/black_purple + name = "black and purple cloak hood" + icon_state = "tesh_hood_bp" + item_state = "tesh_hood_bp" + +/obj/item/clothing/head/tesh_hood/standard/black_pink + name = "black and pink cloak hood" + icon_state = "tesh_hood_bpi" + item_state = "tesh_hood_bpi" + +/obj/item/clothing/head/tesh_hood/standard/black_brown + name = "black and brown cloak hood" + icon_state = "tesh_hood_bbr" + item_state = "tesh_hood_bbr" + +/obj/item/clothing/head/tesh_hood/standard/orange_grey + name = "orange and grey cloak hood" + icon_state = "tesh_hood_og" + item_state = "tesh_hood_og" + +/obj/item/clothing/head/tesh_hood/standard/rainbow + name = "rainbow cloak hood" + icon_state = "tesh_hood_rainbow" + item_state = "tesh_hood_rainbow" + +/obj/item/clothing/head/tesh_hood/standard/lightgrey_grey + name = "light grey and grey cloak hood" + icon_state = "tesh_hood_lgg" + item_state = "tesh_hood_lgg" + +/obj/item/clothing/head/tesh_hood/standard/white_grey + name = "white and grey cloak hood" + icon_state = "tesh_hood_wg" + item_state = "tesh_hood_wg" + +/obj/item/clothing/head/tesh_hood/standard/red_grey + name = "red and grey cloak hood" + icon_state = "tesh_hood_rg" + item_state = "tesh_hood_rg" + +/obj/item/clothing/head/tesh_hood/standard/orange + name = "orange cloak hood" + icon_state = "tesh_hood_on" + item_state = "tesh_hood_on" + +/obj/item/clothing/head/tesh_hood/standard/yellow_grey + name = "yellow and grey cloak hood" + icon_state = "tesh_hood_yg" + item_state = "tesh_hood_yg" + +/obj/item/clothing/head/tesh_hood/standard/green_grey + name = "green and grey cloak hood" + icon_state = "tesh_hood_gg" + item_state = "tesh_hood_gg" + +/obj/item/clothing/head/tesh_hood/standard/blue_grey + name = "blue and grey cloak hood" + icon_state = "tesh_hood_blug" + item_state = "tesh_hood_blug" + +/obj/item/clothing/head/tesh_hood/standard/purple_grey + name = "purple and grey cloak hood" + icon_state = "tesh_hood_pg" + item_state = "tesh_hood_pg" + +/obj/item/clothing/head/tesh_hood/standard/pink_grey + name = "pink and grey cloak hood" + icon_state = "tesh_hood_pig" + item_state = "tesh_hood_pig" + +/obj/item/clothing/head/tesh_hood/standard/brown_grey + name = "brown and grey cloak hood" + icon_state = "tesh_hood_brg" + item_state = "tesh_hood_brg" + +//Belted cloaks +/obj/item/clothing/suit/storage/seromi/beltcloak + name = "belted cloak" + desc = "A more ridged and stylized Teshari cloak." + icon = 'icons/mob/species/seromi/teshari_cloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/teshari_cloak_vr.dmi' + icon_state = "tesh_beltcloak_bo" + item_state = "tesh_beltcloak_bo" + species_restricted = list(SPECIES_TESHARI) + body_parts_covered = UPPER_TORSO|ARMS + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_orange + name = "black belted cloak (orange)" + icon_state = "tesh_beltcloak_bo" + item_state = "tesh_beltcloak_bo" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_grey + name = "black belted cloak" + icon_state = "tesh_beltcloak_bg" + item_state = "tesh_beltcloak_bg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_midgrey + name = "black belted cloak (medium grey)" + icon_state = "tesh_beltcloak_bmg" + item_state = "tesh_beltcloak_bmg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_lightgrey + name = "black belted cloak (light grey)" + icon_state = "tesh_beltcloak_blg" + item_state = "tesh_beltcloak_blg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_white + name = "black belted cloak (white)" + icon_state = "tesh_beltcloak_bw" + item_state = "tesh_beltcloak_bw" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_red + name = "black belted cloak (red)" + icon_state = "tesh_beltcloak_br" + item_state = "tesh_beltcloak_br" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black + name = "black simple belted cloak" + icon_state = "tesh_beltcloak_bn" + item_state = "tesh_beltcloak_bn" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_yellow + name = "black belted cloak (yellow)" + icon_state = "tesh_beltcloak_by" + item_state = "tesh_beltcloak_by" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_green + name = "black belted cloak (green)" + icon_state = "tesh_beltcloak_bgr" + item_state = "tesh_beltcloak_bgr" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_blue + name = "black belted cloak (blue)" + icon_state = "tesh_beltcloak_bbl" + item_state = "tesh_beltcloak_bbl" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_purple + name = "black belted cloak (purple)" + icon_state = "tesh_beltcloak_bp" + item_state = "tesh_beltcloak_bp" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_pink + name = "black belted cloak (pink)" + icon_state = "tesh_beltcloak_bpi" + item_state = "tesh_beltcloak_bpi" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_brown + name = "black belted cloak (brown)" + icon_state = "tesh_beltcloak_bbr" + item_state = "tesh_beltcloak_bbr" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange_grey + name = "orange belted cloak" + icon_state = "tesh_beltcloak_og" + item_state = "tesh_beltcloak_og" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/rainbow + name = "rainbow belted cloak" + icon_state = "tesh_beltcloak_rainbow" + item_state = "tesh_beltcloak_rainbow" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/lightgrey_grey + name = "light grey belted cloak" + icon_state = "tesh_beltcloak_lgg" + item_state = "tesh_beltcloak_lgg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey + name = "white belted cloak" + icon_state = "tesh_beltcloak_wg" + item_state = "tesh_beltcloak_wg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/red_grey + name = "red belted cloak" + icon_state = "tesh_beltcloak_rg" + item_state = "tesh_beltcloak_rg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange + name = "orange simple belted cloak" + icon_state = "tesh_beltcloak_on" + item_state = "tesh_beltcloak_on" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/yellow_grey + name = "yellow belted cloak" + icon_state = "tesh_beltcloak_yg" + item_state = "tesh_beltcloak_yg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/green_grey + name = "green belted cloak" + icon_state = "tesh_beltcloak_gg" + item_state = "tesh_beltcloak_gg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/blue_grey + name = "blue belted cloak" + icon_state = "tesh_beltcloak_blug" + item_state = "tesh_beltcloak_blug" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/purple_grey + name = "purple belted cloak" + icon_state = "tesh_beltcloak_pg" + item_state = "tesh_beltcloak_pg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/pink_grey + name = "pink belted cloak" + icon_state = "tesh_beltcloak_pig" + item_state = "tesh_beltcloak_pig" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/brown_grey + name = "brown belted cloak" + icon_state = "tesh_beltcloak_brg" + item_state = "tesh_beltcloak_brg" + +//Belted job cloaks +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs + icon = 'icons/mob/species/seromi/teshari_cloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/teshari_cloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo + name = "cargo belted cloak" + desc = "A soft Teshari cloak made for the Cargo department" + icon_state = "tesh_beltcloak_car" + item_state = "tesh_beltcloak_car" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining + name = "mining belted cloak" + desc = "A soft Teshari cloak made for Mining" + icon_state = "tesh_beltcloak_mine" + item_state = "tesh_beltcloak_mine" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command + name = "command belted cloak" + desc = "A soft Teshari cloak made for the Command department" + icon_state = "tesh_beltcloak_comm" + item_state = "tesh_beltcloak_comm" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce + name = "chief engineer belted cloak" + desc = "A soft Teshari cloak made the Chief Engineer" + icon_state = "tesh_beltcloak_ce" + item_state = "tesh_beltcloak_ce" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/engineer + name = "engineering belted cloak" + desc = "A soft Teshari cloak made for the Engineering department" + icon_state = "tesh_beltcloak_engie" + item_state = "tesh_beltcloak_engie" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos + name = "atmospherics belted cloak" + desc = "A soft Teshari cloak made for the Atmospheric Technician" + icon_state = "tesh_beltcloak_atmos" + item_state = "tesh_beltcloak_atmos" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo + name = "chief medical officer belted cloak" + desc = "A soft Teshari cloak made the Chief Medical Officer" + icon_state = "tesh_beltcloak_cmo" + item_state = "tesh_beltcloak_cmo" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical + name = "medical belted cloak" + desc = "A soft Teshari cloak made for the Medical department" + icon_state = "tesh_beltcloak_doc" + item_state = "tesh_beltcloak_doc" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry + name = "chemist belted cloak" + desc = "A soft Teshari cloak made for the Chemist" + icon_state = "tesh_beltcloak_vrem" + item_state = "tesh_beltcloak_vrem" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro + name = "virologist belted cloak" + desc = "A soft Teshari cloak made for the Virologist" + icon_state = "tesh_beltcloak_viro" + item_state = "tesh_beltcloak_viro" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para + name = "paramedic belted cloak" + desc = "A soft Teshari cloak made for the Paramedic" + icon_state = "tesh_beltcloak_para" + item_state = "tesh_beltcloak_para" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci + name = "scientist belted cloak" + desc = "A soft Teshari cloak made for the Science department" + icon_state = "tesh_beltcloak_sci" + item_state = "tesh_beltcloak_sci" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo + name = "roboticist belted cloak" + desc = "A soft Teshari cloak made for the Roboticist" + icon_state = "tesh_beltcloak_robo" + item_state = "tesh_beltcloak_robo" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec + name = "security belted cloak" + desc = "A soft Teshari cloak made for the Security department" + icon_state = "tesh_beltcloak_sec" + item_state = "tesh_beltcloak_sec" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm + name = "quartermaster belted cloak" + desc = "A soft Teshari cloak made for the Quartermaster" + icon_state = "tesh_beltcloak_qm" + item_state = "tesh_beltcloak_qm" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service + name = "service belted cloak" + desc = "A soft Teshari cloak made for the Service department" + icon_state = "tesh_beltcloak_serv" + item_state = "tesh_beltcloak_serv" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa + name = "internal affairs belted cloak" + desc = "A soft Teshari cloak made for the Internal Affairs Agent" + icon_state = "tesh_beltcloak_iaa" + item_state = "tesh_beltcloak_iaa" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn + name = "warden belted cloak" + desc = "A soft Teshari cloak made for the Warden" + icon_state = "tesh_beltcloak_wrdn" + item_state = "tesh_beltcloak_wrdn" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/hos + name = "security chief belted cloak" + desc = "A soft Teshari cloak made for the Head of Security" + icon_state = "tesh_beltcloak_hos" + item_state = "tesh_beltcloak_hos" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani + name = "janitor belted cloak" + desc = "A soft Teshari cloak made for the Janitor" + icon_state = "tesh_beltcloak_jani" + item_state = "tesh_beltcloak_jani" + +//Alternate standard & job cloaks. +/obj/item/clothing/suit/storage/teshari/cloak_vr + name = "black cloak (VR)" + desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside." + icon = 'icons/mob/species/seromi/teshari_cloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/teshari_cloak_vr.dmi' + icon_state = "tesh_cloak_bn" + item_state = "tesh_cloak_bn" + species_restricted = list(SPECIES_TESHARI) + body_parts_covered = UPPER_TORSO|ARMS + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_red + name = "black and red cloak (VR)" + icon_state = "tesh_cloak_br" + item_state = "tesh_cloak_br" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_orange + name = "black and orange cloak (VR)" + icon_state = "tesh_cloak_bo" + item_state = "tesh_cloak_bo" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_yellow + name = "black and yellow cloak (VR)" + icon_state = "tesh_cloak_by" + item_state = "tesh_cloak_by" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_green + name = "black and green cloak (VR)" + icon_state = "tesh_cloak_bgr" + item_state = "tesh_cloak_bgr" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_blue + name = "black and blue cloak (VR)" + icon_state = "tesh_cloak_bbl" + item_state = "tesh_cloak_bbl" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_purple + name = "black and purple cloak (VR)" + icon_state = "tesh_cloak_bp" + item_state = "tesh_cloak_bp" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_pink + name = "black and pink cloak (VR)" + icon_state = "tesh_cloak_bpi" + item_state = "tesh_cloak_bpi" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_brown + name = "black and brown cloak (VR)" + icon_state = "tesh_cloak_bbr" + item_state = "tesh_cloak_bbr" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_grey + name = "black and grey cloak (VR)" + icon_state = "tesh_cloak_bg" + item_state = "tesh_cloak_bg" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_white + name = "black and white cloak (VR)" + icon_state = "tesh_cloak_bw" + item_state = "tesh_cloak_bw" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/black_glow + name = "black and glowing cloak (VR)" + icon_state = "tesh_cloak_bglowing" + item_state = "tesh_cloak_bglowing" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/dark_retrowave + name = "dark aesthetic cloak (VR)" + icon_state = "tesh_cloak_dretrowave" + item_state = "tesh_cloak_dretrowave" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/white + name = "white cloak (VR)" + icon_state = "tesh_cloak_wn" + item_state = "tesh_cloak_wn" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/white_grey + name = "white and grey cloak (VR)" + icon_state = "tesh_cloak_wg" + item_state = "tesh_cloak_wg" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/red_grey + name = "red and grey cloak (VR)" + icon_state = "tesh_cloak_rg" + item_state = "tesh_cloak_rg" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/orange_grey + name = "orange and grey cloak (VR)" + icon_state = "tesh_cloak_og" + item_state = "tesh_cloak_og" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/yellow_grey + name = "yellow and grey cloak (VR)" + icon_state = "tesh_cloak_yg" + item_state = "tesh_cloak_yg" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/green_grey + name = "green and grey cloak (VR)" + icon_state = "tesh_cloak_gg" + item_state = "tesh_cloak_gg" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/blue_grey + name = "blue and grey cloak (VR)" + icon_state = "tesh_cloak_blug" + item_state = "tesh_cloak_blug" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/purple_grey + name = "purple and grey cloak (VR)" + icon_state = "tesh_cloak_pg" + item_state = "tesh_cloak_pg" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/pink_grey + name = "pink and grey cloak (VR)" + icon_state = "tesh_cloak_pig" + item_state = "tesh_cloak_pig" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/brown_grey + name = "brown and grey cloak (VR)" + icon_state = "tesh_cloak_brg" + item_state = "tesh_cloak_brg" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/rainbow + name = "rainbow cloak (VR)" + icon_state = "tesh_cloak_rainbow" + item_state = "tesh_cloak_rainbow" + +/obj/item/clothing/suit/storage/teshari/cloak_vr/standard/orange + name = "orange cloak (VR)" + icon_state = "tesh_cloak_on" + item_state = "tesh_cloak_on" + +//Alternate Job Cloaks - subpathed for ease of access in loadouts. If the path ends in _vr not /vr it's net-new. +/obj/item/clothing/suit/storage/seromi/cloak/jobs/cap_vr + name = "facility director cloak (VR)" + desc = "A soft Teshari cloak made for the Facility Director" + icon_state = "tesh_cloak_cap" + item_state = "tesh_cloak_cap" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +//Cargo + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm/vr + name = "quartermaster cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo/vr + name = "cargo cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining/vr + name = "mining cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/command/vr + name = "command cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +//Engineering + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce/vr + name = "chief engineer cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer/vr + name = "engineering cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos/vr + name = "atmospherics cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +//Medical + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo/vr + name = "chief medical officer cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical/vr + name = "medical cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry/vr + name = "chemist cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro/vr + name = "virologist cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/para/vr + name = "paramedic cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/psych_vr + name = "psychiatrist cloak (VR)" + desc = "A soft Teshari cloak made for the Psychiatrist" + icon_state = "tesh_cloak_psych" + item_state = "tesh_cloak_psych" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +//Science + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/rd_vr + name = "research director cloak (VR)" + desc = "A soft Teshari cloak made for the Research Director" + icon_state = "tesh_cloak_rd" + item_state = "tesh_cloak_rd" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci/vr + name = "scientist cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo/vr + name = "roboticist cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +//Security + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos_vr + name = "head of security cloak (VR)" + desc = "A soft Teshari cloak made for the Head of Security" + icon_state = "tesh_cloak_hos" + item_state = "tesh_cloak_hos" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec/vr + name = "security cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa/vr + name = "internal affairs cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +//Service + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/hop_vr + name = "head of personnel cloak (VR)" + desc = "A soft Teshari cloak made for the Head of Personnel" + icon_state = "tesh_cloak_hop" + item_state = "tesh_cloak_hop" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/service/vr + name = "service cloak (VR)" + icon = 'icons/mob/species/seromi/deptcloak_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak_vr.dmi' diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index 0da22a69d9..e225a53eee 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -15,4 +15,18 @@ flags_inv = HIDEHOLSTER allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) - index = 1 \ No newline at end of file + index = 1 + +/obj/item/clothing/head/radiation + sprite_sheets = list( + SPECIES_TESHARI = 'icons/mob/species/seromi/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_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 3e80507879..3e49d93c05 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -12,6 +12,37 @@ item_state = "choker_cst" overlay_state = "choker_cst" var/customized = 0 + var/icon_previous_override + sprite_sheets = list( + SPECIES_TESHARI = 'icons/mob/species/seromi/ties_vr.dmi' + ) + +//Forces different sprite sheet on equip +/obj/item/clothing/accessory/choker/New() + ..() + icon_previous_override = icon_override + +/obj/item/clothing/accessory/choker/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites. + ..() + setUniqueSpeciesSprite() + +/obj/item/clothing/accessory/choker/proc/setUniqueSpeciesSprite() + var/mob/living/carbon/human/H = loc + if(!istype(H) && istype(has_suit) && ishuman(has_suit.loc)) + H = has_suit.loc + if(sprite_sheets && istype(H) && H.species.get_bodytype(H) && (H.species.get_bodytype(H) in sprite_sheets)) + icon_override = sprite_sheets[H.species.get_bodytype(H)] + update_clothing_icon() + +/obj/item/clothing/accessory/choker/on_attached(var/obj/item/clothing/S, var/mob/user) + if(!istype(S)) + return + has_suit = S + setUniqueSpeciesSprite() + ..(S, user) + +/obj/item/clothing/accessory/choker/dropped() + icon_override = icon_previous_override /obj/item/clothing/accessory/choker/attack_self(mob/user as mob) if(!customized) @@ -32,6 +63,37 @@ icon_state = "collar_blk" var/icon_previous_override //yw addition var/writtenon = 0 + var/icon_previous_override + sprite_sheets = list( + SPECIES_TESHARI = 'icons/mob/species/seromi/ties_vr.dmi' + ) + +//Forces different sprite sheet on equip +/obj/item/clothing/accessory/collar/New() + ..() + icon_previous_override = icon_override + +/obj/item/clothing/accessory/collar/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites. + ..() + setUniqueSpeciesSprite() + +/obj/item/clothing/accessory/collar/proc/setUniqueSpeciesSprite() + var/mob/living/carbon/human/H = loc + if(!istype(H) && istype(has_suit) && ishuman(has_suit.loc)) + H = has_suit.loc + if(sprite_sheets && istype(H) && H.species.get_bodytype(H) && (H.species.get_bodytype(H) in sprite_sheets)) + icon_override = sprite_sheets[H.species.get_bodytype(H)] + update_clothing_icon() + +/obj/item/clothing/accessory/collar/on_attached(var/obj/item/clothing/S, var/mob/user) + if(!istype(S)) + return + has_suit = S + setUniqueSpeciesSprite() + ..(S, user) + +/obj/item/clothing/accessory/collar/dropped() + icon_override = icon_previous_override //ywedit start. forces different sprite sheet on equip /obj/item/clothing/accessory/collar/New() diff --git a/code/modules/clothing/under/xenos/seromi_vr.dm b/code/modules/clothing/under/xenos/seromi_vr.dm new file mode 100644 index 0000000000..2f3ee14060 --- /dev/null +++ b/code/modules/clothing/under/xenos/seromi_vr.dm @@ -0,0 +1,121 @@ +//Alternate job undercoat sprites. If the path ends in _vr not /vr it's net-new. + +/obj/item/clothing/under/seromi/undercoat/jobs/cargo/vr + name = "cargo undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/mining/vr + name = "mining undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/cap_vr + name = "facility director undercoat (VR)" + desc = "A traditional Teshari garb made for the Facility Director" + icon_state = "tesh_uniform_cap" + item_state = "tesh_uniform_cap" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/hop_vr + name = "head of personnel undercoat (VR)" + desc = "A traditional Teshari garb made for the Head of Personnel" + icon_state = "tesh_uniform_hop" + item_state = "tesh_uniform_hop" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/ce/vr + name = "chief engineer undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/engineer/vr + name = "engineering undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/atmos/vr + name = "atmospherics undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/cmo/vr + name = "chief medical officer undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/medical/vr + name = "medical undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/chemistry/vr + name = "chemist undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/viro/vr + name = "virologist undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/para/vr + name = "paramedic undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/psych_vr + name = "psychiatrist undercoat (VR)" + desc = "A traditional Teshari garb made for the Psychiatrist" + icon_state = "tesh_uniform_psych" + item_state = "tesh_uniform_psych" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/rd_vr + name = "research director undercoat (VR)" + desc = "A traditional Teshari garb made for the Research Director" + icon_state = "tesh_uniform_rd" + item_state = "tesh_uniform_rd" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/sci/vr + name = "scientist undercoat(VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/robo/vr + name = "roboticist undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/hos_vr + name = "head of security undercoat (VR)" + desc = "A traditional Teshari garb made for the Head of Security." + icon_state = "tesh_uniform_hos" + item_state = "tesh_uniform_hos" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/sec/vr + name = "security undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/qm/vr + name = "quartermaster undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/service/vr + name = "service undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/iaa/vr + name = "internal affairs undercoat (VR)" + icon = 'icons/mob/species/seromi/deptjacket_vr.dmi' + icon_override = 'icons/mob/species/seromi/deptjacket_vr.dmi' diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 3f5379ce1a..26d620982c 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -82,7 +82,7 @@ icon = 'icons/mob/human_face_vr.dmi' icon_add = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_twincurl" - + crescent_moon name = "Crescent-Moon" icon = 'icons/mob/human_face_vr.dmi' @@ -1220,21 +1220,31 @@ c_beast_plating name = "Cyber Plating (Use w/ Cyber Body)" icon_state = "c_beast_plating" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM) c_beast_band name = "Cyber Band (Use w/ Cybertech head)" icon_state = "c_beast_band" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) c_beast_cheek_a - name = "Cyber Beast Cheeks A (Use A and B)" - icon_state = "c_beast_add_a" + name = "Cyber Beast Cheeks A (Use A, B and C)" + icon_state = "c_beast_a" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) c_beast_cheek_b - name = "Cyber Beast Cheeks B (Use A and B)" - icon_state = "c_beast_add_b" + name = "Cyber Beast Cheeks B (Use A, B and C)" + icon_state = "c_beast_b" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + + c_beast_cheek_c + name = "Cyber Beast Cheeks C (Use A, B and C)" + icon_state = "c_beast_c" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) teshari_large_eyes diff --git a/icons/mob/species/seromi/deptcloak_vr.dmi b/icons/mob/species/seromi/deptcloak_vr.dmi new file mode 100644 index 0000000000..7c0f187ec5 Binary files /dev/null and b/icons/mob/species/seromi/deptcloak_vr.dmi differ diff --git a/icons/mob/species/seromi/deptjacket_vr.dmi b/icons/mob/species/seromi/deptjacket_vr.dmi new file mode 100644 index 0000000000..9b65728e65 Binary files /dev/null and b/icons/mob/species/seromi/deptjacket_vr.dmi differ diff --git a/icons/mob/species/seromi/eyes.dmi b/icons/mob/species/seromi/eyes.dmi index c1709e7a58..e50b97c956 100644 Binary files a/icons/mob/species/seromi/eyes.dmi and b/icons/mob/species/seromi/eyes.dmi differ diff --git a/icons/mob/species/seromi/gloves.dmi b/icons/mob/species/seromi/gloves.dmi index ee6354f8d5..3bd28112cb 100644 Binary files a/icons/mob/species/seromi/gloves.dmi and b/icons/mob/species/seromi/gloves.dmi differ diff --git a/icons/mob/species/seromi/helmet_vr.dmi b/icons/mob/species/seromi/helmet_vr.dmi index bbc12adc65..72074b0473 100644 Binary files a/icons/mob/species/seromi/helmet_vr.dmi and b/icons/mob/species/seromi/helmet_vr.dmi differ diff --git a/icons/mob/species/seromi/suit_vr.dmi b/icons/mob/species/seromi/suit_vr.dmi index 21b6ff521e..04ea0d2e7c 100644 Binary files a/icons/mob/species/seromi/suit_vr.dmi and b/icons/mob/species/seromi/suit_vr.dmi differ diff --git a/icons/mob/species/seromi/teshari_cloak_vr.dmi b/icons/mob/species/seromi/teshari_cloak_vr.dmi new file mode 100644 index 0000000000..e765cf364b Binary files /dev/null and b/icons/mob/species/seromi/teshari_cloak_vr.dmi differ diff --git a/icons/mob/species/seromi/teshari_hood_vr.dmi b/icons/mob/species/seromi/teshari_hood_vr.dmi new file mode 100644 index 0000000000..64ae2eced3 Binary files /dev/null and b/icons/mob/species/seromi/teshari_hood_vr.dmi differ diff --git a/icons/mob/species/seromi/teshari_uniform.dmi b/icons/mob/species/seromi/teshari_uniform.dmi index 627a03f201..092f78a0e1 100644 Binary files a/icons/mob/species/seromi/teshari_uniform.dmi and b/icons/mob/species/seromi/teshari_uniform.dmi differ diff --git a/icons/mob/species/seromi/ties.dmi b/icons/mob/species/seromi/ties.dmi index 9969e78109..fb49fe444f 100644 Binary files a/icons/mob/species/seromi/ties.dmi and b/icons/mob/species/seromi/ties.dmi differ diff --git a/icons/mob/species/seromi/ties_vr.dmi b/icons/mob/species/seromi/ties_vr.dmi new file mode 100644 index 0000000000..fce61f2bb8 Binary files /dev/null and b/icons/mob/species/seromi/ties_vr.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index e797e4d094..e410088a23 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/vorestation.dme b/vorestation.dme index f2dc10ca18..0da4b2539e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2073,7 +2073,12 @@ #include "code\modules\clothing\suits\wiz_robe.dm" #include "code\modules\clothing\suits\wolfbrigade.dm" #include "code\modules\clothing\suits\aliens\seromi.dm" +<<<<<<< HEAD #include "code\modules\clothing\suits\aliens\seromi_yw.dm" +||||||| parent of 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word +======= +#include "code\modules\clothing\suits\aliens\seromi_vr.dm" +>>>>>>> 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word #include "code\modules\clothing\suits\aliens\tajara.dm" #include "code\modules\clothing\suits\aliens\unathi.dm" #include "code\modules\clothing\suits\aliens\vox.dm" @@ -2113,6 +2118,7 @@ #include "code\modules\clothing\under\jobs\security.dm" #include "code\modules\clothing\under\jobs\security_vr.dm" #include "code\modules\clothing\under\xenos\seromi.dm" +#include "code\modules\clothing\under\xenos\seromi_vr.dm" #include "code\modules\clothing\under\xenos\vox.dm" #include "code\modules\customitems\item_spawning.dm" #include "code\modules\detectivework\footprints.dm"