diff --git a/code/__defines/sprite_sheets.dm b/code/__defines/sprite_sheets.dm index d5b536bef93..3dce41542ac 100644 --- a/code/__defines/sprite_sheets.dm +++ b/code/__defines/sprite_sheets.dm @@ -1,18 +1,18 @@ // Default species get default sprites, VR species get VR sprites -#define VR_SPECIES_SPRITE_SHEETS_SUIT_MOB list(\ +#define ALL_SPRITE_SHEETS_SUIT_MOB list(\ SPECIES_HUMAN = 'icons/inventory/suit/mob.dmi',\ SPECIES_TAJARAN = 'icons/inventory/suit/mob_tajaran.dmi',\ SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi',\ SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi',\ SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi',\ SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi',\ -SPECIES_AKULA = 'icons/inventory/suit/mob_vr_akula.dmi',\ -SPECIES_SERGAL = 'icons/inventory/suit/mob_vr_sergal.dmi',\ -SPECIES_NEVREAN = 'icons/inventory/suit/mob_vr_sergal.dmi',\ -SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',\ -SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',\ -SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',\ -SPECIES_ALTEVIAN = 'icons/inventory/suit/mob_vr_altevian.dmi') +SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi',\ +SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi',\ +SPECIES_NEVREAN = 'icons/inventory/suit/mob_sergal.dmi',\ +SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vulpkanin.dmi',\ +SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vulpkanin.dmi',\ +SPECIES_FENNEC = 'icons/inventory/suit/mob_vulpkanin.dmi',\ +SPECIES_ALTEVIAN = 'icons/inventory/suit/mob_altevian.dmi') #define VR_SPECIES_SPRITE_SHEETS_HEAD_MOB list(\ SPECIES_HUMAN = 'icons/inventory/head/mob.dmi',\ SPECIES_TAJARAN = 'icons/inventory/head/mob_tajaran.dmi',\ @@ -54,20 +54,20 @@ SPECIES_VULPKANIN = 'icons/inventory/feet/mob_vr_vulpkanin.dmi',\ SPECIES_ZORREN_HIGH = 'icons/inventory/feet/mob_vr_vulpkanin.dmi',\ SPECIES_FENNEC = 'icons/inventory/feet/mob_vr_vulpkanin.dmi') -#define VR_SPECIES_SPRITE_SHEETS_SUIT_ITEM list(\ +#define SPECIES_SPRITE_SHEETS_SUIT_ITEM list(\ SPECIES_HUMAN = 'icons/inventory/suit/item.dmi',\ SPECIES_TAJARAN = 'icons/inventory/suit/item_tajaran.dmi',\ SPECIES_SKRELL = 'icons/inventory/suit/item_skrell.dmi',\ SPECIES_UNATHI = 'icons/inventory/suit/item_unathi.dmi',\ SPECIES_TESHARI = 'icons/inventory/suit/item_teshari.dmi',\ SPECIES_XENOHYBRID = 'icons/inventory/suit/item_unathi.dmi',\ -SPECIES_AKULA = 'icons/inventory/suit/item_vr_akula.dmi',\ -SPECIES_SERGAL = 'icons/inventory/suit/item_vr_sergal.dmi',\ -SPECIES_NEVREAN = 'icons/inventory/suit/item_vr_sergal.dmi',\ -SPECIES_VULPKANIN = 'icons/inventory/suit/item_vr_vulpkanin.dmi',\ -SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vr_vulpkanin.dmi',\ -SPECIES_FENNEC = 'icons/inventory/suit/item_vr_vulpkanin.dmi',\ -SPECIES_ALTEVIAN = 'icons/inventory/suit/item_vr_altevian.dmi') +SPECIES_AKULA = 'icons/inventory/suit/item_akula.dmi',\ +SPECIES_SERGAL = 'icons/inventory/suit/item_sergal.dmi',\ +SPECIES_NEVREAN = 'icons/inventory/suit/item_sergal.dmi',\ +SPECIES_VULPKANIN = 'icons/inventory/suit/item_vulpkanin.dmi',\ +SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vulpkanin.dmi',\ +SPECIES_FENNEC = 'icons/inventory/suit/item_vulpkanin.dmi',\ +SPECIES_ALTEVIAN = 'icons/inventory/suit/item_altevian.dmi') #define VR_SPECIES_SPRITE_SHEETS_HEAD_ITEM list(\ SPECIES_HUMAN = 'icons/inventory/head/item.dmi',\ SPECIES_TAJARAN = 'icons/inventory/head/item_tajaran.dmi',\ @@ -108,22 +108,6 @@ SPECIES_NEVREAN = 'icons/inventory/feet/item_vr_sergal.dmi',\ SPECIES_VULPKANIN = 'icons/inventory/feet/item_vr_vulpkanin.dmi',\ SPECIES_ZORREN_HIGH = 'icons/inventory/feet/item_vr_vulpkanin.dmi',\ SPECIES_FENNEC = 'icons/inventory/feet/item_vr_vulpkanin.dmi') - -// All species get VR sprites -#define ALL_VR_SPRITE_SHEETS_SUIT_MOB list(\ -SPECIES_HUMAN = 'icons/inventory/suit/mob_vr.dmi',\ -SPECIES_TAJARAN = 'icons/inventory/suit/mob_vr_tajaran.dmi',\ -SPECIES_SKRELL = 'icons/inventory/suit/mob_vr_skrell.dmi',\ -SPECIES_UNATHI = 'icons/inventory/suit/mob_vr_unathi.dmi',\ -SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi',\ -SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_vr_unathi.dmi',\ -SPECIES_AKULA = 'icons/inventory/suit/mob_vr_akula.dmi',\ -SPECIES_SERGAL = 'icons/inventory/suit/mob_vr_sergal.dmi',\ -SPECIES_NEVREAN = 'icons/inventory/suit/mob_vr_sergal.dmi',\ -SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',\ -SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',\ -SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi',\ -SPECIES_ALTEVIAN = 'icons/inventory/suit/mob_vr_altevian.dmi') #define ALL_VR_SPRITE_SHEETS_HEAD_MOB list(\ SPECIES_HUMAN = 'icons/inventory/head/mob_vr.dmi',\ SPECIES_TAJARAN = 'icons/inventory/head/mob_vr_tajaran.dmi',\ @@ -164,21 +148,6 @@ SPECIES_NEVREAN = 'icons/inventory/feet/mob_vr_sergal.dmi',\ SPECIES_VULPKANIN = 'icons/inventory/feet/mob_vr_vulpkanin.dmi',\ SPECIES_ZORREN_HIGH = 'icons/inventory/feet/mob_vr_vulpkanin.dmi',\ SPECIES_FENNEC = 'icons/inventory/feet/mob_vr_vulpkanin.dmi') - -#define ALL_VR_SPRITE_SHEETS_SUIT_ITEM list(\ -SPECIES_HUMAN = 'icons/inventory/suit/item_vr.dmi',\ -SPECIES_TAJARAN = 'icons/inventory/suit/item_vr_tajaran.dmi',\ -SPECIES_SKRELL = 'icons/inventory/suit/item_vr_unathi.dmi',\ -SPECIES_UNATHI = 'icons/inventory/suit/item_vr_unathi.dmi',\ -SPECIES_TESHARI = 'icons/inventory/suit/item_vr_teshari.dmi',\ -SPECIES_XENOHYBRID = 'icons/inventory/suit/item_vr_unathi.dmi',\ -SPECIES_AKULA = 'icons/inventory/suit/item_vr_akula.dmi',\ -SPECIES_SERGAL = 'icons/inventory/suit/item_vr_sergal.dmi',\ -SPECIES_NEVREAN = 'icons/inventory/suit/item_vr_sergal.dmi',\ -SPECIES_VULPKANIN = 'icons/inventory/suit/item_vr_vulpkanin.dmi',\ -SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vr_vulpkanin.dmi',\ -SPECIES_FENNEC = 'icons/inventory/suit/item_vr_vulpkanin.dmi',\ -SPECIES_ALTEVIAN = 'icons/inventory/suit/item_vr_altevian.dmi') #define ALL_VR_SPRITE_SHEETS_HEAD_ITEM list(\ SPECIES_HUMAN = 'icons/inventory/head/item_vr.dmi',\ SPECIES_TAJARAN = 'icons/inventory/head/item_vr_unathi.dmi',\ diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 542de42f22d..863aa733295 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -1634,3 +1634,15 @@ GLOBAL_LIST(chamelion_belt_choices) GLOBAL_LIST(chamelion_accessory_choices) GLOBAL_LIST_INIT(tail_layer_options, list("Lower layer" = TAIL_UPPER_LAYER_LOW , "Default layer" = TAIL_UPPER_LAYER , "Upper layer" = TAIL_UPPER_LAYER_HIGH )) + +//Spritesheet stuff. Used by /obj/item/clothing/proc/refit_for_species(var/target_species) +#define SPECIES_HUMANOID_CAN_WEAR list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN) +#define SPECIES_UNATHI_CAN_WEAR list(SPECIES_UNATHI, SPECIES_XENOHYBRID) +#define SPECIES_TAJARAN_CAN_WEAR list(SPECIES_TAJARAN, SPECIES_XENOCHIMERA) +#define SPECIES_VULPKANIN_CAN_WEAR list(SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH, SPECIES_FENNEC) +#define SPECIES_SERGAL_CAN_WEAR list(SPECIES_SERGAL, SPECIES_NEVREAN) +#define SPECIES_TESHARI_CAN_WEAR list(SPECIES_TESHARI) +#define SPECIES_VOX_CAN_WEAR list(SPECIES_VOX) +#define SPECIES_ALL_BUT_TESHARI_CAN_WEAR list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_XENOHYBRID, SPECIES_TAJARAN, SPECIES_XENOCHIMERA, SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH, SPECIES_FENNEC, SPECIES_SERGAL, SPECIES_NEVREAN, SPECIES_VOX, SPECIES_SHADEKIN) +#define SPECIES_ALL_BUT_TESHARI_AND_VOX_CAN_WEAR list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_XENOHYBRID, SPECIES_TAJARAN, SPECIES_XENOCHIMERA, SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH, SPECIES_FENNEC, SPECIES_SERGAL, SPECIES_NEVREAN, SPECIES_SHADEKIN) +#define SPECIES_ALL_CAN_WEAR list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_XENOHYBRID, SPECIES_TAJARAN, SPECIES_XENOCHIMERA, SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH, SPECIES_FENNEC, SPECIES_SERGAL, SPECIES_NEVREAN, SPECIES_TESHARI, SPECIES_VOX, SPECIES_SHADEKIN) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 49fa7554c02..67d02aad51f 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait) // VOREStation var/custom_species - var/base_species = "Human" + var/base_species = SPECIES_HUMAN var/list/species_traits = list() var/blood_color = "#A10808" var/blood_reagents = "iron" diff --git a/code/game/machinery/suit_storage/suit_cycler_datums.dm b/code/game/machinery/suit_storage/suit_cycler_datums.dm index 71411f91119..18bd2df9108 100644 --- a/code/game/machinery/suit_storage/suit_cycler_datums.dm +++ b/code/game/machinery/suit_storage/suit_cycler_datums.dm @@ -348,3 +348,5 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = SPECIES_VULPKANIN /datum/suit_cycler_choice/species/altevian name = SPECIES_ALTEVIAN +/datum/suit_cycler_choice/species/metamorphic + name = "Metamorphic" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index d98de029adb..56945d1046f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -73,20 +73,31 @@ var/mob/living/carbon/human/H = M if("exclude" in species_restricted) - exclusive = 1 + exclusive = TRUE if(H.species) + var/our_species = H.species.get_bodytype(H) if(exclusive) - if(!(H.species.get_bodytype(H) in species_restricted)) - wearable = 1 + if(!(our_species in species_restricted)) + wearable = TRUE else - if(H.species.get_bodytype(H) in species_restricted) - wearable = 1 + if(our_species in species_restricted) + wearable = TRUE + + ///Prevent us from wearing clothing that is restricted to vox, werebeast, or teshari. This generally means it's custom designed for them and them only. + if((((SPECIES_VOX in species_restricted) && our_species != SPECIES_VOX) || ((SPECIES_WEREBEAST in species_restricted) && our_species != SPECIES_WEREBEAST) || ((SPECIES_TESHARI in species_restricted) && our_species != SPECIES_TESHARI))) + wearable = FALSE + + ///Prevent us from from wearing clothing if we ARE a teshari or werebeast. This is due to these two having different anatomy that don't fix most clothing. + else if((our_species == SPECIES_TESHARI || our_species == SPECIES_WEREBEAST) && !sprite_sheets[our_species]) //teshari and werebeasts must have their own sprites. Vox can get away...somewhat + wearable = FALSE + else + wearable = TRUE if(!wearable && !(slot in list(slot_l_store, slot_r_store, slot_s_store))) to_chat(H, span_danger("Your species cannot wear [src].")) - return 0 - return 1 + return FALSE + return TRUE /obj/item/clothing/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") . = ..() @@ -140,18 +151,21 @@ //Set species_restricted list switch(target_species) - //VOREStation Edit Start if(SPECIES_HUMAN, SPECIES_SKRELL) //humanoid bodytypes - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN) + species_restricted = SPECIES_HUMANOID_CAN_WEAR if(SPECIES_UNATHI) - species_restricted = list(SPECIES_UNATHI, SPECIES_XENOHYBRID) + species_restricted = SPECIES_UNATHI_CAN_WEAR if(SPECIES_TAJARAN) - species_restricted = list(SPECIES_TAJARAN, SPECIES_XENOCHIMERA) + species_restricted = SPECIES_TAJARAN_CAN_WEAR if(SPECIES_VULPKANIN) - species_restricted = list(SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH, SPECIES_FENNEC) + species_restricted = SPECIES_VULPKANIN_CAN_WEAR if(SPECIES_SERGAL) - species_restricted = list(SPECIES_SERGAL, SPECIES_NEVREAN) - //VOREStation Edit End + species_restricted = SPECIES_SERGAL_CAN_WEAR + if("Metamorphic") + if(sprite_sheets[SPECIES_TESHARI]) //We have a custom teshari species sprite. Sorry teshari, but otherwise the fallback looks awful on you. + species_restricted = SPECIES_ALL_CAN_WEAR + else + species_restricted = SPECIES_ALL_BUT_TESHARI_CAN_WEAR else species_restricted = list(target_species) @@ -179,33 +193,6 @@ update_clothing_icon() //VOREStation edit end -/obj/item/clothing/head/helmet/refit_for_species(var/target_species) - if(!species_restricted) - return //this item doesn't use the species_restricted system - - //Set species_restricted list - switch(target_species) - //VOREStation Edit Start - if(SPECIES_HUMAN) - species_restricted = list(SPECIES_HUMAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) - if(SPECIES_SKRELL) - species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) - if(SPECIES_UNATHI) - species_restricted = list(SPECIES_UNATHI, SPECIES_XENOHYBRID) - if(SPECIES_VULPKANIN) - species_restricted = list(SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH, SPECIES_FENNEC) - if(SPECIES_SERGAL) - species_restricted = list(SPECIES_SERGAL, SPECIES_NEVREAN) - //VOREStation Edit End - else - species_restricted = list(target_species) - - //Set icon - if (sprite_sheets_obj && (target_species in sprite_sheets_obj)) - icon = sprite_sheets_obj[target_species] - else - icon = initial(icon) - /////////////////////////////////////////////////////////////////////// // Ears: headsets, earmuffs and tiny objects /obj/item/clothing/ears @@ -911,7 +898,7 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', - SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi') + SPECIES_WEREBEAST = 'icons/inventory/suit/mob_werebeast.dmi') max_heat_protection_temperature = T0C+100 allowed = list(POCKET_EMERGENCY) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm index ec3ccd9a303..36941c8f05a 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm @@ -22,16 +22,16 @@ SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi', - SPECIES_AKULA = 'icons/inventory/suit/mob_vr_akula.dmi', - SPECIES_SERGAL = 'icons/inventory/suit/mob_vr_sergal.dmi', - SPECIES_NEVREAN = 'icons/inventory/suit/mob_vr_sergal.dmi', - SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', - SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', + SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/mob_vulpkanin.dmi', SPECIES_PROMETHEAN = 'icons/inventory/suit/mob_skrell.dmi', SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', - SPECIES_ALTEVIAN = 'icons/inventory/suit/mob_vr_altevian.dmi' + SPECIES_ALTEVIAN = 'icons/inventory/suit/mob_altevian.dmi' ) /obj/item/clothing/head/helmet/space/rig diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 74f42f8289d..f88354d366d 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -298,8 +298,8 @@ sprite_sheets = null /obj/item/clothing/suit/space/rig/focalpoint - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "techno_rig" // No animal people sprites for these yet, sad times species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) @@ -354,8 +354,8 @@ sprite_sheets = null /obj/item/clothing/suit/space/rig/hephaestus - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "ihs_rig" // No animal people sprites for these yet, sad times species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) @@ -410,11 +410,11 @@ slowdown = 0 /obj/item/clothing/suit/space/rig/zero - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "null_rig" - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM body_parts_covered = CHEST|LEGS|FEET|ARMS|HANDS // like a voidsuit slowdown = 0 @@ -461,12 +461,12 @@ camera_networks = list(NETWORK_MEDICAL) /obj/item/clothing/suit/space/rig/baymed - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "medical_rig_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/shoes/magboots/rig/ce/baymed icon_state = "medical_rig_bay" @@ -523,12 +523,12 @@ camera_networks = list(NETWORK_ENGINEERING) /obj/item/clothing/suit/space/rig/bayeng - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "engineering_rig_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/shoes/magboots/rig/ce/bayeng icon_state = "engineering_rig_bay" @@ -583,12 +583,12 @@ sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM /obj/item/clothing/suit/space/rig/pathfinder - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "pathfinder_rig_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/shoes/magboots/rig/pathfinder icon_state = "pathfinder_rig_bay" diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 40eed40baf7..9070547d433 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -95,7 +95,7 @@ /obj/item/clothing/suit/space/Initialize(mapload) . = ..() if(type == /obj/item/clothing/suit/space) - LAZYSET(sprite_sheets, SPECIES_TESHARI, 'icons/inventory/suit/mob_vr_teshari.dmi') + LAZYSET(sprite_sheets, SPECIES_TESHARI, 'icons/inventory/suit/mob_teshari.dmi') //VOREStation edit end. /obj/item/clothing/suit/space/equipped(mob/M) diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index be9a01cf839..58c17301b0a 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -7,8 +7,8 @@ slowdown = 0.5 siemens_coefficient = 0.5 species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI,SPECIES_ALTEVIAN) //this thing can autoadapt - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' w_class = ITEMSIZE_NORMAL //the mark vii packs itself down when not in use, thanks future-materials breach_threshold = 16 //Extra Thicc resilience = 0.05 //Military Armor @@ -169,48 +169,48 @@ /obj/item/clothing/suit/space/void/responseteam sprite_sheets = list( - SPECIES_HUMAN = 'icons/inventory/suit/mob_vr.dmi', - SPECIES_TAJARAN = 'icons/inventory/suit/mob_vr_tajaran.dmi', - SPECIES_LLEILL = 'icons/inventory/suit/mob_vr_tajaran.dmi', - SPECIES_SKRELL = 'icons/inventory/suit/mob_vr_skrell.dmi', - SPECIES_UNATHI = 'icons/inventory/suit/mob_vr_unathi.dmi', - SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_vr_unathi.dmi', - SPECIES_AKULA = 'icons/inventory/suit/mob_vr_akula.dmi', - SPECIES_SERGAL = 'icons/inventory/suit/mob_vr_sergal.dmi', - SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', - SPECIES_FENNEC = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', - SPECIES_SHADEKIN = 'icons/inventory/suit/mob_vr_vulpkanin.dmi', - SPECIES_VASILISSAN = 'icons/inventory/suit/mob_vr.dmi', - SPECIES_NEVREAN = 'icons/inventory/suit/mob_vr.dmi', - SPECIES_RAPALA = 'icons/inventory/suit/mob_vr.dmi', - SPECIES_ALRAUNE = 'icons/inventory/suit/mob_vr.dmi', - SPECIES_ZADDAT = 'icons/inventory/suit/mob_vr.dmi' + SPECIES_HUMAN = 'icons/inventory/suit/mob.dmi', + SPECIES_TAJARAN = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_LLEILL = 'icons/inventory/suit/mob_tajaran.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/mob_skrell.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/mob_unathi.dmi', + SPECIES_AKULA = 'icons/inventory/suit/mob_akula.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/mob_sergal.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_SHADEKIN = 'icons/inventory/suit/mob_vulpkanin.dmi', + SPECIES_VASILISSAN = 'icons/inventory/suit/mob.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/mob.dmi', + SPECIES_RAPALA = 'icons/inventory/suit/mob.dmi', + SPECIES_ALRAUNE = 'icons/inventory/suit/mob.dmi', + SPECIES_ZADDAT = 'icons/inventory/suit/mob.dmi' ) sprite_sheets_obj = list( - SPECIES_TAJARAN = 'icons/inventory/suit/item_vr.dmi', - SPECIES_SKRELL = 'icons/inventory/suit/item_vr.dmi', - SPECIES_UNATHI = 'icons/inventory/suit/item_vr.dmi', - SPECIES_XENOHYBRID = 'icons/inventory/suit/item_vr.dmi', - SPECIES_AKULA = 'icons/inventory/suit/item_vr.dmi', - SPECIES_SERGAL = 'icons/inventory/suit/item_vr.dmi', - SPECIES_VULPKANIN = 'icons/inventory/suit/item_vr.dmi', - SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item_vr.dmi', - SPECIES_FENNEC = 'icons/inventory/suit/item_vr.dmi', - SPECIES_SHADEKIN = 'icons/inventory/suit/item_vr.dmi', - SPECIES_VASILISSAN = 'icons/inventory/suit/item_vr.dmi', - SPECIES_NEVREAN = 'icons/inventory/suit/item_vr.dmi', - SPECIES_RAPALA = 'icons/inventory/suit/item_vr.dmi', - SPECIES_ALRAUNE = 'icons/inventory/suit/item_vr.dmi', - SPECIES_ZADDAT = 'icons/inventory/suit/item_vr.dmi', - SPECIES_LLEILL = 'icons/inventory/suit/item_vr.dmi' + SPECIES_TAJARAN = 'icons/inventory/suit/item.dmi', + SPECIES_SKRELL = 'icons/inventory/suit/item.dmi', + SPECIES_UNATHI = 'icons/inventory/suit/item.dmi', + SPECIES_XENOHYBRID = 'icons/inventory/suit/item.dmi', + SPECIES_AKULA = 'icons/inventory/suit/item.dmi', + SPECIES_SERGAL = 'icons/inventory/suit/item.dmi', + SPECIES_VULPKANIN = 'icons/inventory/suit/item.dmi', + SPECIES_ZORREN_HIGH = 'icons/inventory/suit/item.dmi', + SPECIES_FENNEC = 'icons/inventory/suit/item.dmi', + SPECIES_SHADEKIN = 'icons/inventory/suit/item.dmi', + SPECIES_VASILISSAN = 'icons/inventory/suit/item.dmi', + SPECIES_NEVREAN = 'icons/inventory/suit/item.dmi', + SPECIES_RAPALA = 'icons/inventory/suit/item.dmi', + SPECIES_ALRAUNE = 'icons/inventory/suit/item.dmi', + SPECIES_ZADDAT = 'icons/inventory/suit/item.dmi', + SPECIES_LLEILL = 'icons/inventory/suit/item.dmi' ) /obj/item/clothing/head/helmet/space/void/responseteam sprite_sheets = list( SPECIES_HUMAN = 'icons/inventory/head/mob_vr.dmi', SPECIES_TAJARAN = 'icons/inventory/head/mob_vr_tajaran.dmi', - SPECIES_LLEILL = 'icons/inventory/suit/mob_vr_tajaran.dmi', + SPECIES_LLEILL = 'icons/inventory/suit/mob_tajaran.dmi', SPECIES_SKRELL = 'icons/inventory/head/mob_vr_skrell.dmi', SPECIES_UNATHI = 'icons/inventory/head/mob_vr_unathi.dmi', SPECIES_XENOHYBRID = 'icons/inventory/head/mob_vr_unathi.dmi', @@ -242,5 +242,5 @@ SPECIES_RAPALA = 'icons/inventory/head/item_vr.dmi', SPECIES_ALRAUNE = 'icons/inventory/head/item_vr.dmi', SPECIES_ZADDAT = 'icons/inventory/head/item_vr.dmi', - SPECIES_LLEILL = 'icons/inventory/suit/item_vr.dmi' + SPECIES_LLEILL = 'icons/inventory/suit/item.dmi' ) diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index 10e61a51280..970d3b03b2f 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -89,12 +89,12 @@ name = "hazardous environment suit" desc = "Has a strange smell to it, but you feel like it might be an old friend." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "hev_orange" - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/suit/space/void/hev/violet icon_state = "hev_violet" @@ -120,14 +120,14 @@ name = "makeshift voidsuit" desc = "This is not something you should use if you have other options, but it's better than nothing!" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "makeshift_void" armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0) - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/makeshift name = "makeshift voidsuit helmet" @@ -147,14 +147,14 @@ name = "custodian suit" desc = "Vacuum-capable armor for a Custodian to do their duty." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "custodian" armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20) - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/custodian name = "custodian helmet" @@ -174,14 +174,14 @@ name = "\improper Aether voidsuit" desc = "This suit seems rather high-end for a standard voidsuit. The air in it has a hint of 'new car smell', courtesy of Aether Atmospherics." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "moebiussuit" armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20) - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/aether name = "\improper Aether voidsuit helmet" @@ -213,12 +213,12 @@ name = "\improper Excelsior voidsuit" desc = "A space suit from a particular spaceship: Excelsior." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "excelsior" - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/excelsior name = "\improper Excelsior voidsuit helmet" @@ -236,8 +236,8 @@ name = "\improper heartbreaker voidsuit" desc = "The altevians' newest iteration of their armored suits. This one is tailored for zero-g environments, and while it can still be worn in an area with gravity, it'll put a strain on even the most athletic of individuals." - icon = 'icons/inventory/suit/item_vr_altevian.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr_altevian.dmi' + icon = 'icons/inventory/suit/item_altevian.dmi' + default_worn_icon = 'icons/inventory/suit/mob_altevian.dmi' icon_state = "rig-heartbreaker" armor = list(melee = 70, bullet = 70, laser = 70, energy = 30, bomb = 80, bio = 100, rad = 40) @@ -263,8 +263,8 @@ name = "\improper CSC industrial voidsuit" desc = "A heavy-duty Kirillov-Y771 voidsuit intended for use in hazardous shipbreaking, salvage, and industrial operations, manufactured (or more likely refurbished) by the Coyote Salvage Corporation. It's slow and awkward if used outside of microgravity, but it offers good protection for what is technically a civilian-legal voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "breaker_suit" armor = list("melee" = 50, "bullet" = 15, "laser" = 15, "energy" = 25, "bomb" = 45, "bio" = 100, "rad" = 80) @@ -272,8 +272,8 @@ breach_threshold = 14 allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_ENGINEERING) - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker name = "\improper CSC industrial voidsuit helmet" diff --git a/code/modules/clothing/spacesuits/void/military_vr.dm b/code/modules/clothing/spacesuits/void/military_vr.dm index e4b40097e4f..cd4441a5682 100644 --- a/code/modules/clothing/spacesuits/void/military_vr.dm +++ b/code/modules/clothing/spacesuits/void/military_vr.dm @@ -50,8 +50,8 @@ icon_state = "odst" item_state = "odst" item_state_slots = null - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' species_restricted = null breach_threshold = 16 //Extra Thicc resilience = 0.05 //Military Armor diff --git a/code/modules/clothing/spacesuits/void/station_vr.dm b/code/modules/clothing/spacesuits/void/station_vr.dm index 5a6240b4dc6..b17d373f2ba 100644 --- a/code/modules/clothing/spacesuits/void/station_vr.dm +++ b/code/modules/clothing/spacesuits/void/station_vr.dm @@ -2,12 +2,12 @@ /obj/item/clothing/suit/space/void/mining/alt2 desc = "A surplus Commonwealth mining voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_mining_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 0 /obj/item/clothing/head/helmet/space/void/mining/alt2 @@ -24,12 +24,12 @@ /obj/item/clothing/suit/space/anomaly/alt desc = "A surplus Commonwealth anomaly suit! Slightly more comfortable and easier to move in than your average anomaly suit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_excavation_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 0.5 /obj/item/clothing/head/helmet/space/anomaly/alt @@ -47,12 +47,12 @@ /obj/item/clothing/suit/space/void/security/riot/alt desc = "A surplus Commonwealth riot control voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_secalt_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 0.5 /obj/item/clothing/head/helmet/space/void/security/riot/alt @@ -69,12 +69,12 @@ /obj/item/clothing/suit/space/void/pilot/alt2 desc = "A surplus Commonwealth pilot voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_pilot_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 0 /obj/item/clothing/head/helmet/space/void/pilot/alt2 @@ -91,12 +91,12 @@ /obj/item/clothing/suit/space/void/medical/alt2 desc = "A surplus Commonwealth medical voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_medicalalt_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 0 /obj/item/clothing/head/helmet/space/void/medical/alt2 @@ -113,12 +113,12 @@ /obj/item/clothing/suit/space/void/exploration/alt2 desc = "A surplus Commonwealth exploration voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_explorer_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 0 /obj/item/clothing/head/helmet/space/void/exploration/alt2 @@ -135,12 +135,12 @@ /obj/item/clothing/suit/space/void/engineering/alt2 desc = "A surplus Commonwealth engineering voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_engineeringalt_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 0.5 /obj/item/clothing/head/helmet/space/void/engineering/alt2 @@ -157,12 +157,12 @@ /obj/item/clothing/suit/space/void/atmos/alt2 desc = "A surplus Commonwealth atmospherics voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_atmosalt_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 0.5 /obj/item/clothing/head/helmet/space/void/atmos/alt2 @@ -179,12 +179,12 @@ /obj/item/clothing/suit/space/void/captain/alt desc = "A surplus Commonwealth Navy captain voidsuit! Slightly more comfortable and easier to move in than your average voidsuit." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "void_command_bay" item_state = null - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM slowdown = 1.0 /obj/item/clothing/head/helmet/space/void/captain/alt diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 4c64861731d..b21e115195d 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -33,8 +33,8 @@ special_hood_handling = TRUE actions_types = list(/datum/action/item_action/toggle_helmet) species_restricted = list("Human", SPECIES_SKRELL, "Promethean") - sprite_sheets = VR_SPECIES_SPRITE_SHEETS_SUIT_MOB - sprite_sheets_obj = VR_SPECIES_SPRITE_SHEETS_SUIT_ITEM + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = SPECIES_SPRITE_SHEETS_SUIT_ITEM //Breach thresholds, should ideally be inherited by most (if not all) voidsuits. //With 0.2 resiliance, will reach 10 breach damage after 3 laser carbine blasts or 8 smg hits. diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index d2fd59e290e..dc18beb3e79 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -38,8 +38,8 @@ desc = "Hostile Environment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from \[REDACTED\]. It wasn't enough for its last owner." icon_state = "hostile_env" item_state = "hostile_env" - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' slowdown = 1.5 armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) @@ -59,8 +59,8 @@ desc = "A free suit, gifted you by your new not-quite-corporate master!" icon_state = "syndicate-contract" item_state = "syndicate-contract" - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.6 @@ -77,13 +77,13 @@ desc = "From out of space and time, this helmet will protect you while you perform your duties." icon_state = "chronosuit" item_state = "chronosuit" - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' /obj/item/clothing/suit/space/void/autolok name = "AutoLok pressure suit" desc = "A high-tech snug-fitting pressure suit. Fits any species. It offers very little physical protection, but is equipped with sensors that will automatically deploy the integral helmet to protect the wearer." - icon = 'icons/inventory/suit/item_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "autoloksuit" item_state = "autoloksuit" item_state_slots = list(slot_r_hand_str = "space_suit_syndicate", slot_l_hand_str = "space_suit_syndicate") @@ -93,8 +93,8 @@ species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt breach_threshold = 6 //this thing is basically tissue paper w_class = ITEMSIZE_NORMAL //if it's snug, high-tech, and made of relatively soft materials, it should be much easier to store! - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' - sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + default_worn_icon = 'icons/inventory/suit/mob.dmi' + sprite_sheets = ALL_SPRITE_SHEETS_SUIT_MOB sprite_sheets_obj = null /obj/item/clothing/suit/space/void/autolok/Initialize(mapload) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index e499f16a334..41a42f2e343 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -55,16 +55,16 @@ name = "marine body armor" desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon-and we had to share the rock!" icon_state = "unsc_armor" - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' body_parts_covered = CHEST // ToDo: Break up the armor into smaller bits. /obj/item/clothing/suit/armor/combat/imperial name = "imperial soldier armor" desc = "Made out of an especially light metal, it lets you conquer in style." icon_state = "ge_armor" - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' body_parts_covered = CHEST /obj/item/clothing/suit/armor/combat/imperial/centurion @@ -73,12 +73,12 @@ icon_state = "ge_armorcent" /obj/item/clothing/suit/storage/vest/wardencoat/alt2 - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' /obj/item/clothing/suit/storage/vest/hoscoat/jensen/alt - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' // Armor Versions Here /obj/item/clothing/suit/armor/combat/crusader @@ -138,8 +138,8 @@ armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0) - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "crusader_suit" /obj/item/clothing/head/helmet/crusader diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index 5ebdaea5623..22cbb2cfee1 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -5,8 +5,8 @@ /obj/item/clothing/suit/storage/hooded/techpriest name = "tech priest robe" desc = "Praise be to the Omnissiah." - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "techpriest" hoodtype = /obj/item/clothing/head/hood/techpriest armor = list(melee = 20, bullet = 10, laser = 10, energy = 10, bomb = 25, bio = 50, rad = 25) @@ -91,8 +91,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/talon name = "Talon winter coat" desc = "A cozy winter coat, covered in thick fur and baring the colors of ITV Talon." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "taloncoat" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/talon @@ -108,8 +108,8 @@ /obj/item/clothing/suit/storage/hooded/foodcostume/hotdog //Belly filler uniform :^). name = "hotdog costume" desc = "A giant hotdog costume, comes with authentic artificial hotdog scent." - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "hotdog" item_state_slots = list(slot_r_hand_str = "hotdog", slot_l_hand_str = "hotdog") hoodtype = /obj/item/clothing/head/hood_vr/hotdog_hood @@ -117,8 +117,8 @@ /obj/item/clothing/suit/storage/hooded/foodcostume/turnip //Honey wake up, new vorny jail uniform just dropped. name = "turnip costume" desc = "A giant turnip costume, extra padding helps the wearer stand in the same spot for hours." - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "turnip" item_state_slots = list(slot_r_hand_str = "turnip", slot_l_hand_str = "turnip") hoodtype = /obj/item/clothing/head/hood_vr/turnip_hood @@ -128,8 +128,8 @@ /obj/item/clothing/suit/storage/hooded/hoodie name = "hoodie" desc = "A warm jacket, now featuring a hood!" - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "hoodie_plain" item_state_slots = list(slot_r_hand_str = "grey_hoodie", slot_l_hand_str = "grey_hoodie") body_parts_covered = CHEST|ARMS|LEGS @@ -168,22 +168,22 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/centcom name = "centcom winter coat" desc = "A cozy winter coat, covered in green fur and the colors of CentCom. Armored for extra protection." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "coatcentcom" armor = list(melee = 40, bullet = 45, laser = 45, energy = 35, bomb = 40, bio = 25, rad = 25, fire = 35, acid = 50) //there is no cc armor here to base it off so, here's the values from the original cc coat hoodtype = /obj/item/clothing/head/hood/winter/centcom /obj/item/clothing/suit/storage/hooded/wintercoat - sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi', + sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi') //Hoodies worth their weight in gold (as in you can unbutton them and toggle the hood independently) /obj/item/clothing/suit/storage/hooded/toggle/colorable name = "hoodie" desc = "A rather plain hoodie. If you can't find it in your closet, chances are your significant other is borrowing it." - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "choodie" hoodtype = /obj/item/clothing/head/hood/toggleable/colorable open = FALSE diff --git a/code/modules/clothing/suits/jobs_vr.dm b/code/modules/clothing/suits/jobs_vr.dm index 2ec54b4d1e0..15716bf7224 100644 --- a/code/modules/clothing/suits/jobs_vr.dm +++ b/code/modules/clothing/suits/jobs_vr.dm @@ -3,8 +3,8 @@ name = "cargo jacket" desc = "A jacket typically assigned to cargo technicians when it's chilly in cargonia." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "cargo_jacket" // QM Coat @@ -12,8 +12,8 @@ name = "\improper QM coat" desc = "A coat typically assigned to quartermasters when it's chilly in cargonia." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "qm_coat" //Atmos-coloured hazard vest @@ -21,8 +21,8 @@ name = "light blue hazard vest" desc = "A high-visibility vest used in work zones. This one is in the colors of atmospherics!" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "hazard_a" item_state = "hazard_a" item_icons = list( diff --git a/code/modules/clothing/suits/labcoat_vr.dm b/code/modules/clothing/suits/labcoat_vr.dm index c945735807b..946cdbb9407 100644 --- a/code/modules/clothing/suits/labcoat_vr.dm +++ b/code/modules/clothing/suits/labcoat_vr.dm @@ -2,8 +2,8 @@ /obj/item/clothing/suit/storage/toggle/labcoat/modern name = "modern labcoat" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "labcoat_mod" /obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo @@ -15,8 +15,8 @@ /obj/item/clothing/suit/bio_suit/modern name = "modern bio suit" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "bio_mod" /obj/item/clothing/head/bio_hood/modern @@ -32,34 +32,34 @@ /obj/item/clothing/suit/storage/toggle/labcoat/old name = "old-school labcoat" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "labcoat_old" /obj/item/clothing/suit/storage/toggle/labcoat/old/tox name = "old-school scientist's labcoat" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "labcoat_old_tox" /obj/item/clothing/suit/storage/toggle/labcoat/old/chem name = "old-school chemist's labcoat" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "labcoat_old_chem" /obj/item/clothing/suit/storage/toggle/labcoat/old/vir name = "old-school virologist's labcoat" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "labcoat_old_vir" /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo name = "old-school CMO's labcoat" - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "labcoat_old_cmo" diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm index 4cffa105e67..1448cd397c9 100644 --- a/code/modules/clothing/suits/miscellaneous_vr.dm +++ b/code/modules/clothing/suits/miscellaneous_vr.dm @@ -4,16 +4,16 @@ /obj/item/clothing/suit/chiton name = "chiton" desc = "A traditional piece of clothing from Greece." - icon = 'icons/inventory/suit/item_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "chiton" - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' /obj/item/clothing/suit/oversize name = "oversized t-shirt" desc = "This ain't your daddy's shirt! Well, it might be..." - icon = 'icons/inventory/suit/item_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' icon_state = "oversize" - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' //HERE BE TAUR RELATED CLOTHES @@ -97,16 +97,16 @@ name = "sleek modern coat" desc = "A sleek overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "cyberpunksleek" /obj/item/clothing/suit/storage/det_trench/alt2 name = "sleek modern coat (long)" desc = "A sleek long overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "cyberpunksleek_long" /obj/item/clothing/suit/storage/det_trench/alt/black @@ -119,8 +119,8 @@ /obj/item/clothing/suit/storage/toggle/hoodie/talon name = "Talon hoodie" desc = "A warm, blue sweatshirt bearing ITV Talon markings." - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "talonhoodie" item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue") @@ -129,8 +129,8 @@ name = "leather coat" desc = "An old leather coat. Has probably seen things you wouldn't believe." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "bladerunner_coat" // Cyberpunk 'orange' vest @@ -138,8 +138,8 @@ name = "cyberpunk vest" desc = "A red vest with golden streaks. It's made out of tough materials, and can protect fairly well against bullets. Wake the fuck up, Samurai." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "cyberpunk" armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index fb46aea9f07..8695ac06e93 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -5,8 +5,8 @@ /obj/item/clothing/suit/storage/toggle/paramedic name = "paramedic vest" desc = "A vest that protects against minor chemical spills." - icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "paramedic-vest" item_state = "paramedic-vest" item_state_slots = list(slot_r_hand_str = "blue_labcoat", slot_l_hand_str = "blue_labcoat") @@ -25,7 +25,7 @@ /obj/item/clothing/suit/radiation sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi', + SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi', SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', - SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi' + SPECIES_WEREBEAST = 'icons/inventory/suit/mob_werebeast.dmi' ) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index db8cff7102a..c9a0d0b7c2c 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -176,10 +176,10 @@ name = "long fur coat" desc = "A sophisticated long coat made of fur." - icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/mob.dmi' icon_state = "russofurcoat" - icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon_override = 'icons/inventory/suit/mob.dmi' item_state = "russofurcoat" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) @@ -1199,8 +1199,8 @@ Departamental Swimsuits, for general use /obj/item/clothing/suit/storage/trek/ds9 name = "Padded Overcoat" desc = "The overcoat worn by all officers of the 2380s." - icon = 'icons/inventory/suit/item_vr.dmi' - default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "trek_ds9_coat" body_parts_covered = CHEST|ARMS permeability_coefficient = 0.50 diff --git a/config/example/config.txt b/config/example/config.txt index c51746668fa..ee22b1fe75e 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -655,4 +655,4 @@ TOAST_NOTIFICATION_ON_INIT #ALLOW_TRACY_START ## Uncomment to allow admins with +DEBUG to queue the next round to run the byond-tracy profiler. -#ALLOW_TRACY_QUEUE +#ALLOW_TRACY_QUEUE \ No newline at end of file diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 1dc05b96bf5..954162361ef 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/item_vr_akula.dmi b/icons/inventory/suit/item_akula.dmi similarity index 100% rename from icons/inventory/suit/item_vr_akula.dmi rename to icons/inventory/suit/item_akula.dmi diff --git a/icons/inventory/suit/item_vr_altevian.dmi b/icons/inventory/suit/item_altevian.dmi similarity index 100% rename from icons/inventory/suit/item_vr_altevian.dmi rename to icons/inventory/suit/item_altevian.dmi diff --git a/icons/inventory/suit/item_vr_sergal.dmi b/icons/inventory/suit/item_sergal.dmi similarity index 100% rename from icons/inventory/suit/item_vr_sergal.dmi rename to icons/inventory/suit/item_sergal.dmi diff --git a/icons/inventory/suit/item_skrell.dmi b/icons/inventory/suit/item_skrell.dmi index 07f161ec5ea..5750948450d 100644 Binary files a/icons/inventory/suit/item_skrell.dmi and b/icons/inventory/suit/item_skrell.dmi differ diff --git a/icons/inventory/suit/item_tajaran.dmi b/icons/inventory/suit/item_tajaran.dmi index c75fff6abf1..708d4c5268b 100644 Binary files a/icons/inventory/suit/item_tajaran.dmi and b/icons/inventory/suit/item_tajaran.dmi differ diff --git a/icons/inventory/suit/item_unathi.dmi b/icons/inventory/suit/item_unathi.dmi index c98b4bde97d..930cc8b5f62 100644 Binary files a/icons/inventory/suit/item_unathi.dmi and b/icons/inventory/suit/item_unathi.dmi differ diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi deleted file mode 100644 index f99663dc3a2..00000000000 Binary files a/icons/inventory/suit/item_vr.dmi and /dev/null differ diff --git a/icons/inventory/suit/item_vr_tajaran.dmi b/icons/inventory/suit/item_vr_tajaran.dmi deleted file mode 100644 index 899e828df0f..00000000000 Binary files a/icons/inventory/suit/item_vr_tajaran.dmi and /dev/null differ diff --git a/icons/inventory/suit/item_vr_teshari.dmi b/icons/inventory/suit/item_vr_teshari.dmi deleted file mode 100644 index cf74d73796c..00000000000 Binary files a/icons/inventory/suit/item_vr_teshari.dmi and /dev/null differ diff --git a/icons/inventory/suit/item_vr_unathi.dmi b/icons/inventory/suit/item_vr_unathi.dmi deleted file mode 100644 index 899e828df0f..00000000000 Binary files a/icons/inventory/suit/item_vr_unathi.dmi and /dev/null differ diff --git a/icons/inventory/suit/item_vr_vulpkanin.dmi b/icons/inventory/suit/item_vulpkanin.dmi similarity index 100% rename from icons/inventory/suit/item_vr_vulpkanin.dmi rename to icons/inventory/suit/item_vulpkanin.dmi diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 2d5a14ae683..713ef98056e 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/suit/mob_vr_akula.dmi b/icons/inventory/suit/mob_akula.dmi similarity index 100% rename from icons/inventory/suit/mob_vr_akula.dmi rename to icons/inventory/suit/mob_akula.dmi diff --git a/icons/inventory/suit/mob_vr_altevian.dmi b/icons/inventory/suit/mob_altevian.dmi similarity index 100% rename from icons/inventory/suit/mob_vr_altevian.dmi rename to icons/inventory/suit/mob_altevian.dmi diff --git a/icons/inventory/suit/mob_vr_sergal.dmi b/icons/inventory/suit/mob_sergal.dmi similarity index 100% rename from icons/inventory/suit/mob_vr_sergal.dmi rename to icons/inventory/suit/mob_sergal.dmi diff --git a/icons/inventory/suit/mob_skrell.dmi b/icons/inventory/suit/mob_skrell.dmi index cdc768c53b2..7276a366564 100644 Binary files a/icons/inventory/suit/mob_skrell.dmi and b/icons/inventory/suit/mob_skrell.dmi differ diff --git a/icons/inventory/suit/mob_tajaran.dmi b/icons/inventory/suit/mob_tajaran.dmi index ec4c40f709b..064a1fdd386 100644 Binary files a/icons/inventory/suit/mob_tajaran.dmi and b/icons/inventory/suit/mob_tajaran.dmi differ diff --git a/icons/inventory/suit/mob_teshari.dmi b/icons/inventory/suit/mob_teshari.dmi index 4e5a0791d72..7f33109ba9e 100644 Binary files a/icons/inventory/suit/mob_teshari.dmi and b/icons/inventory/suit/mob_teshari.dmi differ diff --git a/icons/inventory/suit/mob_unathi.dmi b/icons/inventory/suit/mob_unathi.dmi index b549c5849ce..4545018cb5d 100644 Binary files a/icons/inventory/suit/mob_unathi.dmi and b/icons/inventory/suit/mob_unathi.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi deleted file mode 100644 index 44991c4243b..00000000000 Binary files a/icons/inventory/suit/mob_vr.dmi and /dev/null differ diff --git a/icons/inventory/suit/mob_vr_skrell.dmi b/icons/inventory/suit/mob_vr_skrell.dmi deleted file mode 100644 index bc6f654ce8f..00000000000 Binary files a/icons/inventory/suit/mob_vr_skrell.dmi and /dev/null differ diff --git a/icons/inventory/suit/mob_vr_tajaran.dmi b/icons/inventory/suit/mob_vr_tajaran.dmi deleted file mode 100644 index 8c6e406990c..00000000000 Binary files a/icons/inventory/suit/mob_vr_tajaran.dmi and /dev/null differ diff --git a/icons/inventory/suit/mob_vr_teshari.dmi b/icons/inventory/suit/mob_vr_teshari.dmi deleted file mode 100644 index 80f67332cb2..00000000000 Binary files a/icons/inventory/suit/mob_vr_teshari.dmi and /dev/null differ diff --git a/icons/inventory/suit/mob_vr_unathi.dmi b/icons/inventory/suit/mob_vr_unathi.dmi deleted file mode 100644 index ff26fb614c6..00000000000 Binary files a/icons/inventory/suit/mob_vr_unathi.dmi and /dev/null differ diff --git a/icons/inventory/suit/mob_vr_vulpkanin.dmi b/icons/inventory/suit/mob_vulpkanin.dmi similarity index 100% rename from icons/inventory/suit/mob_vr_vulpkanin.dmi rename to icons/inventory/suit/mob_vulpkanin.dmi diff --git a/icons/inventory/suit/mob_vr_werebeast.dmi b/icons/inventory/suit/mob_werebeast.dmi similarity index 100% rename from icons/inventory/suit/mob_vr_werebeast.dmi rename to icons/inventory/suit/mob_werebeast.dmi