diff --git a/modular_citadel/code/modules/client/loadout/uniform_trek.dm b/modular_citadel/code/modules/client/loadout/uniform_trek.dm new file mode 100644 index 0000000000..dd03d3c446 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/uniform_trek.dm @@ -0,0 +1,156 @@ +// Trekie things +//TOS +/datum/gear/uniform/job_trek/cmd/tos + name = "TOS uniform, cmd" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/command + restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") + +/datum/gear/uniform/job_trek/medsci/tos + name = "TOS uniform, med/sci" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/medsci + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") + +/datum/gear/uniform/job_trek/eng/tos + name = "TOS uniform, ops/sec" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/engsec + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") + +//Federation jackets from movies +/datum/gear/uniform/job_trek/cmd/cap + name = "fed (movie) uniform, Captain" + category = slot_wear_suit + path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt + restricted_roles = list("Captain","Head of Personnel") + +/datum/gear/uniform/job_trek/cmd/mov + name = "fed (movie) uniform, sec" + category = slot_wear_suit + path = /obj/item/clothing/suit/storage/fluff/fedcoat + restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer") + +/datum/gear/suit/job_trek/medsci/mov + name = "fed (movie) uniform, med/sci" + category = slot_wear_suit + path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") + +/datum/gear/suit/job_trek/eng/mov + name = "fed (movie) uniform, ops/eng" + category = slot_wear_suit + path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster") + +//TNG +/datum/gear/uniform/job_trek/cmd/tng + name = "TNG uniform, cmd" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/command/next + restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") + +/datum/gear/uniform/job_trek/medsci/tng + name = "TNG uniform, med/sci" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/medsci/next + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") + +/datum/gear/uniform/job_trek/eng/tng + name = "TNG uniform, ops/sec" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/engsec/next + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") + +//VOY +/datum/gear/uniform/job_trek/cmd/voy + name = "VOY uniform, cmd" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/command/voy + restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") + +/datum/gear/uniform/job_trek/medsci/voy + name = "VOY uniform, med/sci" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/medsci/voy + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") + +/datum/gear/uniform/job_trek/eng/voy + name = "VOY uniform, ops/sec" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/engsec/voy + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") + +//DS9 + +/datum/gear/suit/job_trek/ds9_coat + name = "DS9 Overcoat (use uniform)" + category = slot_wear_suit + path = /obj/item/clothing/suit/storage/trek/ds9 + 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. + +/datum/gear/uniform/job_trek/cmd/ds9 + name = "DS9 uniform, cmd" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/command/ds9 + restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") + +/datum/gear/uniform/job_trek/medsci/ds9 + name = "DS9 uniform, med/sci" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/medsci/ds9 + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") + +/datum/gear/uniform/job_trek/eng/ds9 + name = "DS9 uniform, ops/sec" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/engsec/ds9 + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") + + +//ENT +/datum/gear/uniform/job_trek/cmd/ent + name = "ENT uniform, cmd" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/command/ent + restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") + +/datum/gear/uniform/job_trek/medsci/ent + name = "ENT uniform, med/sci" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/medsci/ent + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") + +/datum/gear/uniform/job_trek/eng/ent + name = "ENT uniform, ops/sec" + category = slot_w_uniform + path = /obj/item/clothing/under/rank/trek/engsec/ent + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") + +//Hats! +/datum/gear/hat/job_trek/cap + name = "Federation Officer's Cap" + category = slot_head + path = /obj/item/clothing/head/caphat/formal/fedcover + restricted_roles = list("Captain","Head of Personnel") + +/datum/gear/hat/job_trek/cap/medisci + name = "Federation Officer's Cap" + category = slot_head + path = /obj/item/clothing/head/caphat/formal/fedcover/medsci + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") + +/datum/gear/hat/job_trek/cap/eng + name = "Federation Officer's Cap" + category = slot_head + path = /obj/item/clothing/head/caphat/formal/fedcover/eng + restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster") + +/datum/gear/hat/job_trek/cap/sec + name = "Federation Officer's Cap" + category = slot_head + path = /obj/item/clothing/head/caphat/formal/fedcover/sec + 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/clothing/under/trek_under.dm b/modular_citadel/code/modules/clothing/under/trek_under.dm new file mode 100644 index 0000000000..60276325cb --- /dev/null +++ b/modular_citadel/code/modules/clothing/under/trek_under.dm @@ -0,0 +1,257 @@ +/*///////////////////////////////////////////////////////////////////////////////// +/////// /////// +/////// Star Trek Stuffs /////// +/////// /////// +*////////////////////////////////////////////////////////////////////////////////// +// <3 Nienhaus && Joan. +// I made the Voy and DS9 stuff tho. - Poojy + + + +/obj/item/clothing/under/rank/trek + name = "Section 31 Uniform" + desc = "Oooh... right." + icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + item_state = "" + can_adjust = FALSE //to prevent you from "wearing it casually" + +//TOS +/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" + armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0) // Considering only staff heads get to pick it + +/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" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 10, "acid" = 0) // since they're shared between jobs and kinda moot. + +/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" + permeability_coefficient = 0.50 + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 10) // basically a copy of vanilla sci/med + +//TNG +/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" + +/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" + +/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" + +//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" + +/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" + +/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" + +//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" + +/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" + +/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" + +//DS9 + +/obj/item/clothing/suit/storage/trek/ds9 + name = "Padded Overcoat" + desc = "The overcoat worn by all officers of the 2380s." + icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon_state = "trek_ds9_coat" + icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + item_state = "trek_ds9_coat" + body_parts_covered = CHEST|GROIN|ARMS + permeability_coefficient = 0.50 + allowed = list( + /obj/item/device/flashlight, /obj/item/device/analyzer, + /obj/item/device/radio, /obj/item/tank/internals/emergency_oxygen, + /obj/item/reagent_containers/hypospray, /obj/item/device/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 + ) + armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0) + +/obj/item/clothing/suit/storage/trek/ds9/admiral // Only for adminuz + name = "Admiral Overcoat" + desc = "Admirality specialty coat to keep flag officers fashionable and protected." + icon_state = "trek_ds9_coat_adm" + item_state = "trek_ds9_coat_adm" + permeability_coefficient = 0.01 + armor = list("melee" = 50, "bullet" = 50, "laser" = 50,"energy" = 50, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 50, "acid" = 50) + +/obj/item/clothing/under/rank/trek/command/ds9 + desc = "The uniform worn by command officers of the 2380s." + icon_state = "trek_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" + 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" + 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." + + icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + icon_state = "fedcoat" + item_state = "fedcoat" + + blood_overlay_type = "coat" + body_parts_covered = CHEST|GROIN|ARMS + allowed = list( + /obj/item/tank/internals/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/device/analyzer, + /obj/item/device/radio, + /obj/item/gun, + /obj/item/melee/baton, + /obj/item/restraints/handcuffs, + /obj/item/reagent_containers/hypospray, + /obj/item/device/healthanalyzer, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/glass/bottle/vial, + /obj/item/reagent_containers/glass/beaker, + /obj/item/storage/pill_bottle, + /obj/item/device/taperecorder) + armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0) + var/unbuttoned = 0 + + verb/toggle() + set name = "Toggle coat buttons" + set category = "Object" + set src in usr + + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + switch(unbuttoned) + if(0) + icon_state = "[initial(icon_state)]_open" + item_state = "[initial(item_state)]_open" + unbuttoned = 1 + 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." + 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" + +//"modern" ones for fancy + +/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." + icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon_override = '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/device/flashlight, + /obj/item/gun, + /obj/item/melee/baton, + /obj/item/restraints/handcuffs, + /obj/item/device/taperecorder) + armor = list("melee" = 45, "bullet" = 25, "laser" = 25,"energy" = 25, "bomb" = 25, "bio" = 25, "rad" = 50, "fire" = 50, "acid" = 50) + + //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" + +/obj/item/clothing/head/caphat/formal/fedcover + name = "Federation Officer's Cap" + desc = "An officer's cap that demands discipline from the one who wears it." + icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' + icon_state = "fedcapofficer" + icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + item_state = "fedcapofficer_mob" + armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0) + + //Variants +/obj/item/clothing/head/caphat/formal/fedcover/medsci + icon_state = "fedcapsci" + item_state = "fedcapsci_mob" + +/obj/item/clothing/head/caphat/formal/fedcover/eng + icon_state = "fedcapeng" + item_state = "fedcapeng_mob" + +/obj/item/clothing/head/caphat/formal/fedcover/sec + icon_state = "fedcapsec" + item_state = "fedcapsec_mob" \ No newline at end of file diff --git a/modular_citadel/icons/mob/clothing/fed hats n modern.dmi b/modular_citadel/icons/mob/clothing/fed hats n modern.dmi new file mode 100644 index 0000000000..ab8682b785 Binary files /dev/null and b/modular_citadel/icons/mob/clothing/fed hats n modern.dmi differ diff --git a/modular_citadel/icons/mob/clothing/fedcoats.dmi b/modular_citadel/icons/mob/clothing/fedcoats.dmi new file mode 100644 index 0000000000..6554b3a45d Binary files /dev/null and b/modular_citadel/icons/mob/clothing/fedcoats.dmi differ diff --git a/modular_citadel/icons/mob/clothing/trek_item_icon.dmi b/modular_citadel/icons/mob/clothing/trek_item_icon.dmi new file mode 100644 index 0000000000..4ac77773a0 Binary files /dev/null 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 new file mode 100644 index 0000000000..9323ea9f3c Binary files /dev/null and b/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi differ diff --git a/tgstation.dme b/tgstation.dme index d645ba2a0a..2dd4d1c4ce 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2659,10 +2659,12 @@ #include "modular_citadel\code\modules\client\loadout\shoes.dm" #include "modular_citadel\code\modules\client\loadout\suit.dm" #include "modular_citadel\code\modules\client\loadout\uniform.dm" +#include "modular_citadel\code\modules\client\loadout\uniform_trek.dm" #include "modular_citadel\code\modules\client\verbs\who.dm" #include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm" #include "modular_citadel\code\modules\clothing\suits\suits.dm" #include "modular_citadel\code\modules\clothing\under\polychromic_clothes.dm" +#include "modular_citadel\code\modules\clothing\under\trek_under.dm" #include "modular_citadel\code\modules\clothing\under\turtlenecks.dm" #include "modular_citadel\code\modules\clothing\under\under.dm" #include "modular_citadel\code\modules\crafting\recipes.dm"