diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 067f32023d..b1ab4e6886 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -908,9 +908,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[gear.cost]" if(islist(gear.restricted_roles)) if(gear.restricted_roles.len) - dat += "" - dat += gear.restricted_roles.Join(";") - dat += "" + if(gear.restricted_desc) + dat += "" + dat += gear.restricted_desc + dat += "" + else + dat += "" + dat += gear.restricted_roles.Join(";") + dat += "" dat += "[gear.description]" dat += "" diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 1ef203d538..bd26f44482 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -56,25 +56,34 @@ //trek fancy Hats! /datum/gear/trekcap - name = "Federation Officer's Cap" + name = "Federation Officer's Cap (White)" category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover restricted_roles = list("Captain","Head of Personnel") +/datum/gear/trekcapcap + name = "Federation Officer's Cap (Black)" + category = SLOT_HEAD + path = /obj/item/clothing/head/caphat/formal/fedcover/black + restricted_roles = list("Captain","Head of Personnel") + /datum/gear/trekcapmedisci - name = "Federation Officer's Cap" + name = "Federation Officer's Cap (Blue)" category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover/medsci + restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekcapeng - name = "Federation Officer's Cap" + name = "Federation Officer's Cap (Yellow)" category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover/eng + 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") /datum/gear/trekcapsec - name = "Federation Officer's Cap" + name = "Federation Officer's Cap (Red)" category = SLOT_HEAD path = /obj/item/clothing/head/caphat/formal/fedcover/sec + 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") \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/loadout.dm b/modular_citadel/code/modules/client/loadout/loadout.dm index 52e4f86dbe..2e11519d0b 100644 --- a/modular_citadel/code/modules/client/loadout/loadout.dm +++ b/modular_citadel/code/modules/client/loadout/loadout.dm @@ -52,6 +52,7 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) var/geargroupID //defines the ID that the gear inherits from the config var/list/restricted_roles var/list/ckeywhitelist + var/restricted_desc /datum/gear/New() ..() diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 9d3a6b9a02..5a12a6bf0b 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -84,31 +84,62 @@ name = "DS9 Overcoat (use uniform)" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/trek/ds9 + 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") //everyone who actually deserves a job. //Federation jackets from movies /datum/gear/trekcmdcap - name = "fed (movie) uniform, Captain" + name = "Fed (movie) uniform, Black" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt restricted_roles = list("Captain","Head of Personnel") /datum/gear/trekcmdmov - name = "fed (movie) uniform, sec" + name = "Fed (movie) uniform, Red" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/fedcoat + restricted_desc = "Heads of Staff and Security" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer") /datum/gear/trekmedscimov - name = "fed (movie) uniform, med/sci" + name = "Fed (movie) uniform, Blue" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci + restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengmov - name = "fed (movie) uniform, ops/eng" + name = "Fed (movie) uniform, Yellow" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng + restricted_desc = "Engineering and Cargo" + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster") + +/datum/gear/trekcmdcapmod + name = "Fed (Modern) uniform, White" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/storage/fluff/modernfedcoat + restricted_roles = list("Captain","Head of Personnel") + +/datum/gear/trekcmdmod + name = "Fed (Modern) uniform, Red" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/sec + restricted_desc = "Heads of Staff and Security" + restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer") + +/datum/gear/trekmedscimod + name = "Fed (Modern) uniform, Blue" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci + restricted_desc = "Medical and Science" + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") + +/datum/gear/trekengmod + name = "Fed (Modern) uniform, Yellow" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/eng + restricted_desc = "Engineering and Cargo" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster") diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index e4e2f063d3..81e17e95d3 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -179,18 +179,21 @@ name = "TOS uniform, cmd" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/command + restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") /datum/gear/trekmedscitos name = "TOS uniform, med/sci" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/medsci + restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengtos name = "TOS uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/engsec + restricted_desc = "Engineering and Security" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //TNG @@ -198,18 +201,21 @@ name = "TNG uniform, cmd" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/command/next + restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") /datum/gear/trekmedscitng name = "TNG uniform, med/sci" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/medsci/next + restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengtng name = "TNG uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/engsec/next + restricted_desc = "Engineering and Security" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //VOY @@ -217,18 +223,21 @@ name = "VOY uniform, cmd" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/command/voy + restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") /datum/gear/trekmedscivoy name = "VOY uniform, med/sci" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/medsci/voy + restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengvoy name = "VOY uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/engsec/voy + restricted_desc = "Engineering and Security" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //DS9 @@ -236,18 +245,21 @@ name = "DS9 uniform, cmd" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/command/ds9 + restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") /datum/gear/trekmedscids9 name = "DS9 uniform, med/sci" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/medsci/ds9 + restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengds9 name = "DS9 uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/engsec/ds9 + restricted_desc = "Engineering and Security" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") //ENT @@ -255,16 +267,19 @@ name = "ENT uniform, cmd" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/command/ent + restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") /datum/gear/trekmedscient name = "ENT uniform, med/sci" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/medsci/ent + restricted_desc = "Medical and Science" restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengent name = "ENT uniform, ops/sec" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/rank/trek/engsec/ent + restricted_desc = "Engineering and Security" restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") diff --git a/modular_citadel/code/modules/clothing/under/trek_under.dm b/modular_citadel/code/modules/clothing/under/trek_under.dm index ddcf0e6344..8e2b94372d 100644 --- a/modular_citadel/code/modules/clothing/under/trek_under.dm +++ b/modular_citadel/code/modules/clothing/under/trek_under.dm @@ -15,7 +15,6 @@ alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' item_state = "" can_adjust = FALSE //to prevent you from "wearing it casually" - mutantrace_variation = NO_MUTANTRACE_VARIATION //TOS /obj/item/clothing/under/rank/trek/command @@ -117,25 +116,25 @@ /obj/item/clothing/under/rank/trek/command/ds9 desc = "The uniform worn by command officers of the 2380s." - icon_state = "trek_command" + icon_state = "trek_ds9_command" item_state = "trek_ds9_command" /obj/item/clothing/under/rank/trek/engsec/ds9 desc = "The uniform worn by operations officers of the 2380s." - icon_state = "trek_engsec" + icon_state = "trek_ds9_engsec" item_state = "trek_ds9_engsec" /obj/item/clothing/under/rank/trek/medsci/ds9 desc = "The uniform undershirt worn by medsci officers of the 2380s." - icon_state = "trek_medsci" + icon_state = "trek_ds9_medsci" item_state = "trek_ds9_medsci" //MODERN ish Joan sqrl sprites. I think //For general use /obj/item/clothing/suit/storage/fluff/fedcoat - name = "Federation Uniform Jacket (Red)" - desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. Set phasers to awesome." + name = "Federation Uniform Jacket" + desc = "A uniform jacket from the United Federation. Set phasers to awesome." icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' @@ -177,27 +176,24 @@ icon_state = "[initial(icon_state)]_open" item_state = "[initial(item_state)]_open" unbuttoned = 1 - usr << "You unbutton the coat." + to_chat(usr,"You unbutton the coat.") if(1) icon_state = "[initial(icon_state)]" item_state = "[initial(item_state)]" unbuttoned = 0 - usr << "You button up the coat." + to_chat(usr,"You button up the coat.") usr.update_inv_wear_suit() //Variants /obj/item/clothing/suit/storage/fluff/fedcoat/medsci - desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. Wearing this may make you feel all scientific." icon_state = "fedblue" item_state = "fedblue" /obj/item/clothing/suit/storage/fluff/fedcoat/eng - desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it.Wearing it may make you feel like checking a warp core, whatever that is." icon_state = "fedeng" item_state = "fedeng" /obj/item/clothing/suit/storage/fluff/fedcoat/capt - desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. You feel like a commanding officer of Starfleet." icon_state = "fedcapt" item_state = "fedcapt" @@ -205,34 +201,31 @@ /obj/item/clothing/suit/storage/fluff/modernfedcoat name = "Modern Federation Uniform Jacket" - desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. Wearing this makes you feel like a competant commander." + desc = "A modern uniform jacket from the United Federation." icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi' alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "fedmodern" item_state = "fedmodern" body_parts_covered = CHEST|GROIN|ARMS allowed = list( - /obj/item/tank/internals/emergency_oxygen, - /obj/item/flashlight, - /obj/item/gun, - /obj/item/melee/baton, - /obj/item/restraints/handcuffs, - /obj/item/taperecorder) - armor = list("melee" = 45, "bullet" = 25, "laser" = 25,"energy" = 25, "bomb" = 25, "bio" = 25, "rad" = 50, "fire" = 50, "acid" = 50) + /obj/item/flashlight, /obj/item/analyzer, + /obj/item/radio, /obj/item/tank/internals/emergency_oxygen, + /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/glass/bottle/vial,/obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs,/obj/item/hypospray + ) + armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0) //Variants /obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci - desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. Wearing this makes you feel like a scientist or a pilot." icon_state = "fedmodernblue" item_state = "fedmodernblue" /obj/item/clothing/suit/storage/fluff/modernfedcoat/eng - desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. You feel like you can handle any type of technical engineering problems." icon_state = "fedmoderneng" item_state = "fedmoderneng" /obj/item/clothing/suit/storage/fluff/modernfedcoat/sec - desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. This uniform makes you want to protect and serve as an officer." icon_state = "fedmodernsec" item_state = "fedmodernsec" @@ -256,3 +249,7 @@ /obj/item/clothing/head/caphat/formal/fedcover/sec icon_state = "fedcapsec" item_state = "fedcapsec" + +/obj/item/clothing/head/caphat/formal/fedcover/black + icon_state = "fedcapblack" + item_state = "fedcapblack" diff --git a/modular_citadel/icons/mob/clothing/trek_item_icon.dmi b/modular_citadel/icons/mob/clothing/trek_item_icon.dmi index 86afe16b03..ed3286615b 100644 Binary files a/modular_citadel/icons/mob/clothing/trek_item_icon.dmi and b/modular_citadel/icons/mob/clothing/trek_item_icon.dmi differ diff --git a/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi b/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi index 51daa8179f..d3ebc31b6a 100644 Binary files a/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi and b/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi differ diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index 22fddbe59d..c19fb01161 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi index c5ee6b1780..9513f82c9c 100644 Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ