From e07efc29fb7b18cd48ee379a3f2bbfa35778b686 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Tue, 6 Mar 2018 20:10:14 -0600 Subject: [PATCH 1/2] stuffs --- .../modules/client/loadout/uniform_trek.dm | 156 +++++++++++ .../code/modules/clothing/under/trek_under.dm | 257 ++++++++++++++++++ .../icons/mob/clothing/fed hats n modern.dmi | Bin 0 -> 2892 bytes .../icons/mob/clothing/fedcoats.dmi | Bin 0 -> 2061 bytes .../icons/mob/clothing/trek_item_icon.dmi | Bin 0 -> 5381 bytes .../icons/mob/clothing/trek_mob_icon.dmi | Bin 0 -> 8967 bytes 6 files changed, 413 insertions(+) create mode 100644 modular_citadel/code/modules/client/loadout/uniform_trek.dm create mode 100644 modular_citadel/code/modules/clothing/under/trek_under.dm create mode 100644 modular_citadel/icons/mob/clothing/fed hats n modern.dmi create mode 100644 modular_citadel/icons/mob/clothing/fedcoats.dmi create mode 100644 modular_citadel/icons/mob/clothing/trek_item_icon.dmi create mode 100644 modular_citadel/icons/mob/clothing/trek_mob_icon.dmi 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..965015c9f3 --- /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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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 + display_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..23c912aff9 --- /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' + alternate_worn_icon = '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' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + icon_state = "trek_ds9_coat" + item_state = "trek_ds9_coat_mob" + 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/weapon/tank/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 + ) + armor = list("melee" = 20, "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_mob" + 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' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + icon_state = "fedcoat" + item_state = "fedcoat" + + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + allowed = list( + /obj/item/tank/emergency/oxygen, + /obj/item/device/flashlight, + /obj/item/device/analyzer, + /obj/item/device/radio, + /obj/item/gun, + /obj/item/melee/baton, + /obj/item/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" = 20, "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' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + icon_state = "fedmodern" + item_state = "fedmodern" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + allowed = list( + /obj/item/tank/emergency/oxygen, + /obj/item/device/flashlight, + /obj/item/gun, + /obj/item/melee/baton, + /obj/item/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' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + icon_state = "fedcapofficer" + 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 0000000000000000000000000000000000000000..ab8682b7859146ef47faa5e580bedf5d86a15323 GIT binary patch literal 2892 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 Date: Wed, 7 Mar 2018 02:44:50 -0600 Subject: [PATCH 2/2] yey, working and in the loadout, though it fucks with the formatting --- .../modules/client/loadout/uniform_trek.dm | 52 +++++++++--------- .../code/modules/clothing/under/trek_under.dm | 36 ++++++------ .../icons/mob/clothing/trek_mob_icon.dmi | Bin 8967 -> 8965 bytes tgstation.dme | 2 + 4 files changed, 46 insertions(+), 44 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform_trek.dm b/modular_citadel/code/modules/client/loadout/uniform_trek.dm index 965015c9f3..dd03d3c446 100644 --- a/modular_citadel/code/modules/client/loadout/uniform_trek.dm +++ b/modular_citadel/code/modules/client/loadout/uniform_trek.dm @@ -1,82 +1,82 @@ // Trekie things //TOS /datum/gear/uniform/job_trek/cmd/tos - display_name = "TOS uniform, cmd" + 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 - display_name = "TOS uniform, med/sci" + 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 - display_name = "TOS uniform, ops/sec" + 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 - display_name = "fed (movie) uniform, Captain" + 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 - display_name = "fed (movie) uniform, sec" + 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 - display_name = "fed (movie) uniform, med/sci" + 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 - display_name = "fed (movie) uniform, ops/eng" + 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 - display_name = "TNG uniform, cmd" + 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 - display_name = "TNG uniform, med/sci" + 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 - display_name = "TNG uniform, ops/sec" + 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 - display_name = "VOY uniform, cmd" + 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 - display_name = "VOY uniform, med/sci" + 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 - display_name = "VOY uniform, ops/sec" + 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") @@ -84,28 +84,28 @@ //DS9 /datum/gear/suit/job_trek/ds9_coat - display_name = "DS9 Overcoat (use uniform)" + 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" + "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 - display_name = "DS9 uniform, cmd" + 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 - display_name = "DS9 uniform, med/sci" + 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 - display_name = "DS9 uniform, ops/sec" + 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") @@ -113,19 +113,19 @@ //ENT /datum/gear/uniform/job_trek/cmd/ent - display_name = "ENT uniform, cmd" + 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 - display_name = "ENT uniform, med/sci" + 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") + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/uniform/job_trek/eng/ent - display_name = "ENT uniform, ops/sec" + 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") @@ -141,14 +141,14 @@ 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") - + 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 diff --git a/modular_citadel/code/modules/clothing/under/trek_under.dm b/modular_citadel/code/modules/clothing/under/trek_under.dm index 23c912aff9..60276325cb 100644 --- a/modular_citadel/code/modules/clothing/under/trek_under.dm +++ b/modular_citadel/code/modules/clothing/under/trek_under.dm @@ -12,7 +12,7 @@ name = "Section 31 Uniform" desc = "Oooh... right." icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_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" @@ -93,25 +93,25 @@ name = "Padded Overcoat" desc = "The overcoat worn by all officers of the 2380s." icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "trek_ds9_coat" - item_state = "trek_ds9_coat_mob" + 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/weapon/tank/emergency/oxygen, + /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/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs ) - armor = list("melee" = 20, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0) + 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_mob" + 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) @@ -138,28 +138,28 @@ 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' - alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_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 = UPPER_TORSO|LOWER_TORSO|ARMS + body_parts_covered = CHEST|GROIN|ARMS allowed = list( - /obj/item/tank/emergency/oxygen, + /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/handcuffs, + /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/storage/pill_bottle, /obj/item/device/taperecorder) - armor = list("melee" = 20, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0) + 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() @@ -205,16 +205,16 @@ 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' - alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "fedmodern" item_state = "fedmodern" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + body_parts_covered = CHEST|GROIN|ARMS allowed = list( - /obj/item/tank/emergency/oxygen, + /obj/item/tank/internals/emergency_oxygen, /obj/item/device/flashlight, /obj/item/gun, /obj/item/melee/baton, - /obj/item/handcuffs, + /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) @@ -238,8 +238,8 @@ 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' - alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_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) diff --git a/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi b/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi index ca721aa8320557c639667f01ed4c6fcffec39e16..9323ea9f3c046bac5c946a909a5c0e6b7ef2ceac 100644 GIT binary patch delta 312 zcmV-80muG_MukSO$O3;LdQ@0+L}hbha%pgMX>V=-0C=3GmAh^OArM7t_zGmVR^+VH zq(~Flid@9Mu);9wMG0U5@#F8!Y`Q4f%&a?*?wPss5X{x<=54!E>-ViZLCP)$^`f30 zmQtLZEq%SL8Yy~khrWDYa?u6qaaIz1v?hA5gPloXUCPKx(ItQF0nd*=#1IY{3{C67 zX5(nu0GGlFJ^(E11HtihidU8;)UzBRz%gX=GcN%GoC;9SH>3+s-D>Np+s2$R0-S3ZhhQS)y6T@)i^^PyUrO%RKiCKDg31reJuGH@qJh>nr5;3h24LC!99E} z?;d<)rsMe7g8nN{wz1BI(%|XsL6V$iau;#Cs7dO2O>J2vN7KyJX15+bs~gEV0LUYo KrYy7b0~8-?C74S9 delta 314 zcmV-A0mc4>Mu$eQ$O3;NdQ@0+L}hbha%pgMX>V=-0C=3Gl|fGfArOVn@GD4rZA`oM z;=zk)V|uWEVMAfIODfO+t@`g}R!>IF481|}KIXj#*`2GW?elK0HZMDQg_KQUX_ zEv0yKwv2VN?xYyO9mn#u$we2a%UMZq>P_@s2ixbF6xOATv=o0s(jIWV`XPsK%wVW$ z4>lV|RR?%4%mEX^j4&}gXV>__G=>Dz7a}}cHa~EOAi_(6M2jt5OO6L7p{=J=5ZHH* z2roVo