diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index a9709a4c95..bc64168142 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -44,6 +44,7 @@ /obj/item/clothing/under/trek/medsci/next desc = "The uniform worn by medsci officers. This one's from the mid 2360s." icon_state = "trek_next_medsci" + item_state = "b_suit" //ENT @@ -67,35 +68,51 @@ /obj/item/clothing/under/trek/command/voy desc = "The uniform worn by command officers of the 2370s." icon_state = "trek_voy_command" - item_state = "trek_voy_command" + item_state = "r_suit" /obj/item/clothing/under/trek/engsec/voy desc = "The uniform worn by operations officers of the 2370s." icon_state = "trek_voy_engsec" - item_state = "trek_voy_engsec" + item_state = "y_suit" /obj/item/clothing/under/trek/medsci/voy desc = "The uniform worn by medsci officers of the 2370s." icon_state = "trek_voy_medsci" - item_state = "trek_voy_medsci" + item_state = "b_suit" //DS9 /obj/item/clothing/under/trek/command/ds9 desc = "The uniform worn by command officers of the 2380s." icon_state = "trek_ds9_command" - item_state = "trek_ds9_command" + item_state = "r_suit" /obj/item/clothing/under/trek/engsec/ds9 desc = "The uniform worn by operations officers of the 2380s." icon_state = "trek_ds9_engsec" - item_state = "trek_ds9_engsec" + item_state = "y_suit" /obj/item/clothing/under/trek/medsci/ds9 desc = "The uniform undershirt worn by medsci officers of the 2380s." icon_state = "trek_ds9_medsci" - item_state = "trek_ds9_medsci" + item_state = "b_suit" +//The Motion Picture +/obj/item/clothing/under/trek/fedutil + name = "federation utility uniform" + desc = "The uniform worn by United Federation enlisted crew members in 2285s." + icon_state = "trek_tmp_enlist" + item_state = "r_suit" + +/obj/item/clothing/under/trek/fedutil/trainee + name = "federation trainee utility uniform" + desc = "The uniform worn by United Federation enlisted trainees in 2285s." + icon_state = "trek_tmp_trainee" + +/obj/item/clothing/under/trek/fedutil/service + name = "federation service uniform" + desc = "The uniform worn by United Federation enlists for service work in 2285s." + icon_state = "trek_tmp_service" //Q /obj/item/clothing/under/trek/Q diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 96ff50e138..371c5066df 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index 94890dd6ad..7fe37547e9 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 45affef3be..a485deb9ad 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 4c66522df8..e9adc317cb 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -292,7 +292,7 @@ name = "TOS uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec - restricted_desc = "Engineering and Security" + restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //TNG @@ -314,7 +314,7 @@ name = "TNG uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/next - restricted_desc = "Engineering and Security" + restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //VOY @@ -336,7 +336,7 @@ name = "VOY uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/voy - restricted_desc = "Engineering and Security" + restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //DS9 @@ -358,7 +358,7 @@ name = "DS9 uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/ds9 - restricted_desc = "Engineering and Security" + restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //ENT @@ -380,9 +380,33 @@ name = "ENT uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/engsec/ent - restricted_desc = "Engineering and Security" + restricted_desc = "Engineering, Security, and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") +//TheMotionPicture +/datum/gear/trekfedutil + name = "TMP uniform" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/fedutil + restricted_desc = "All, barring Service and Civilian" + restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster", + "Medical Doctor","Chemist","Virologist","Geneticist","Scientist", "Roboticist", + "Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer", + "Cargo Technician", "Shaft Miner") + +/datum/gear/trekfedtrainee + name = "TMP uniform, trainee" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/fedutil/trainee + restricted_roles = list("Assistant", "Janitor", "Cargo Technician") + +/datum/gear/trekfedservice + name = "TMP uniform, service" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/fedutil/service + restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer" + restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor") + //Memes /datum/gear/gear_harnesses name = "Gear Harness"