diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 0f5112c748..86ca4b5619 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -48,65 +48,65 @@ //TOS /datum/gear/uniform/job_trek/cmd/tos display_name = "TOS uniform, cmd" - path = /obj/item/clothing/under/fluff/trek/command + path = /obj/item/clothing/under/rank/trek/command allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/tos display_name = "TOS uniform, med/sci" - path = /obj/item/clothing/under/fluff/trek/medsci + path = /obj/item/clothing/under/rank/trek/medsci allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/job_trek/eng/tos display_name = "TOS uniform, eng/sec" - path = /obj/item/clothing/under/fluff/trek/engsec + path = /obj/item/clothing/under/rank/trek/engsec allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") //TNG /datum/gear/uniform/job_trek/cmd/tng display_name = "TNG uniform, cmd" - path = /obj/item/clothing/under/fluff/trek/command/next + path = /obj/item/clothing/under/rank/trek/command/next allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/tng display_name = "TNG uniform, med/sci" - path = /obj/item/clothing/under/fluff/trek/medsci/next + path = /obj/item/clothing/under/rank/trek/medsci/next allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/job_trek/eng/tng display_name = "TNG uniform, eng/sec" - path = /obj/item/clothing/under/fluff/trek/engsec/next + path = /obj/item/clothing/under/rank/trek/engsec/next allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") //VOY /datum/gear/uniform/job_trek/cmd/voy display_name = "VOY uniform, cmd" - path = /obj/item/clothing/under/fluff/trek/command/voy + path = /obj/item/clothing/under/rank/trek/command/voy allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/voy display_name = "VOY uniform, med/sci" - path = /obj/item/clothing/under/fluff/trek/medsci/voy + path = /obj/item/clothing/under/rank/trek/medsci/voy allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/job_trek/eng/voy display_name = "VOY uniform, eng/sec" - path = /obj/item/clothing/under/fluff/trek/engsec/voy + path = /obj/item/clothing/under/rank/trek/engsec/voy allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") //ENT /datum/gear/uniform/job_trek/cmd/ent display_name = "ENT uniform, cmd" - path = /obj/item/clothing/under/fluff/trek/command/ent + path = /obj/item/clothing/under/rank/trek/command/ent allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/ent display_name = "ENT uniform, med/sci" - path = /obj/item/clothing/under/fluff/trek/medsci/ent + path = /obj/item/clothing/under/rank/trek/medsci/ent allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/job_trek/eng/ent display_name = "ENT uniform, eng/sec" - path = /obj/item/clothing/under/fluff/trek/engsec/ent + path = /obj/item/clothing/under/rank/trek/engsec/ent allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") /* Swimsuits diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index a882ff3553..37237962b3 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -994,67 +994,80 @@ Departamental Swimsuits, for general use // PS. <3 Nienhaus -/obj/item/clothing/under/fluff/trek +/obj/item/clothing/under/rank/trek + name = "Section 31 Uniform" + desc = "Oooh... right." icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "" //TOS -/obj/item/clothing/under/fluff/trek/command - name = "command uniform" - desc = "The uniform worn by command officers" +/obj/item/clothing/under/rank/trek/command + name = "Command Uniform" + desc = "The uniform worn by command officers in the mid 2260s." icon_state = "trek_command" - item_state = "trek_command_mob" + item_state = "trek_command" armor = list(melee = 10, bullet = 10, laser = 10,energy = 0, bomb = 0, bio = 10, rad = 10, fire = 0, acid = 0) // Considering only staff heads get to pick it -/obj/item/clothing/under/fluff/trek/engsec - name = "engsec uniform" - desc = "The uniform worn by engineering/security officers" +/obj/item/clothing/under/rank/trek/engsec + name = "Operations Uniform" + desc = "The uniform worn by operations officers of the mid 2260s. You feel strangely vulnerable just seeing this..." icon_state = "trek_engsec" - item_state = "trek_engsec_mob" + item_state = "trek_engsec" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10, fire = 0, acid = 0) // since they're shared between jobs and kinda moot. -/obj/item/clothing/under/fluff/trek/medsci - name = "medsci uniform" - desc = "The uniform worn by medical/science officers" +/obj/item/clothing/under/rank/trek/medsci + name = "MedSci Uniform" + desc = "The uniform worn by medsci officers in the mid 2260s." icon_state = "trek_medsci" - item_state = "trek_medsci_mob" + item_state = "trek_medsci" + permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0) // basically a copy of vanilla sci/med //TNG -/obj/item/clothing/under/fluff/trek/command/next +/obj/item/clothing/under/rank/trek/command/next + desc = "The uniform worn by command officers. This one's from the mid 2360s." icon_state = "trek_next_command" - item_state = "trek_next_command_mob" + item_state = "trek_next_command" -/obj/item/clothing/under/fluff/trek/engsec/next +/obj/item/clothing/under/rank/trek/engsec/next + desc = "The uniform worn by operation officers. This one's from the mid 2360s." icon_state = "trek_next_engsec" - item_state = "trek_next_engsec_mob" + item_state = "trek_next_engsec" -/obj/item/clothing/under/fluff/trek/medsci/next +/obj/item/clothing/under/rank/trek/medsci/next + desc = "The uniform worn by medsci officers. This one's from the mid 2360s." icon_state = "trek_next_medsci" - item_state = "trek_next_medsci_mob" + item_state = "trek_next_medsci" //ENT -/obj/item/clothing/under/fluff/trek/command/ent +/obj/item/clothing/under/rank/trek/command/ent + desc = "The uniform worn by command officers of the 2140s." icon_state = "trek_ent_command" - item_state = "trek_ent_command_mob" + item_state = "trek_ent_command" -/obj/item/clothing/under/fluff/trek/engsec/ent +/obj/item/clothing/under/rank/trek/engsec/ent + desc = "The uniform worn by operations officers of the 2140s." icon_state = "trek_ent_engsec" - item_state = "trek_ent_engsec_mob" + item_state = "trek_ent_engsec" -/obj/item/clothing/under/fluff/trek/medsci/ent +/obj/item/clothing/under/rank/trek/medsci/ent + desc = "The uniform worn by medsci officers of the 2140s." icon_state = "trek_ent_medsci" - item_state = "trek_ent_medsci_mob" + item_state = "trek_ent_medsci" //VOY -/obj/item/clothing/under/fluff/trek/command/voy +/obj/item/clothing/under/rank/trek/command/voy + desc = "The uniform worn by command officers of the 2370s." icon_state = "trek_voy_command" - item_state = "trek_voy_command_mob" + item_state = "trek_voy_command" -/obj/item/clothing/under/fluff/trek/engsec/voy +/obj/item/clothing/under/rank/trek/engsec/voy + desc = "The uniform worn by operations officers of the 2370s." icon_state = "trek_voy_engsec" - item_state = "trek_voy_engsec_mob" + item_state = "trek_voy_engsec" -/obj/item/clothing/under/fluff/trek/medsci/voy +/obj/item/clothing/under/rank/trek/medsci/voy + desc = "The uniform worn by medsci officers of the 2370s." icon_state = "trek_voy_medsci" - item_state = "trek_voy_medsci_mob" + item_state = "trek_voy_medsci" diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index fabb47ef0c..23daf43993 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ