diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 59360e0ff5..168debf2cc 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -48,26 +48,26 @@ category = slot_head path = /obj/item/clothing/head/that -//Hats! -/datum/gear/job_trek +//trek fancy Hats! +/datum/gear/trekcap 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/job_trek/medisci +/datum/gear/trekcapmedisci 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/job_trek/eng +/datum/gear/trekcapeng 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/job_trek/sec +/datum/gear/trekcapsec name = "Federation Officer's Cap" category = slot_head path = /obj/item/clothing/head/caphat/formal/fedcover/sec diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 3c18bef566..941da5c29f 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -67,3 +67,36 @@ name = "Ian Shirt" category = slot_wear_suit path = /obj/item/clothing/suit/ianshirt + +/datum/gear/trekds9_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. +//Federation jackets from movies +/datum/gear/trekcmdcap + 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/trekcmdmov + 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/trekmedscimov + 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/trekengmov + 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") \ No newline at end of file diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 1487166e13..acb2b4e13c 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -122,3 +122,99 @@ name = "Tactitool Turtleneck" category = slot_w_uniform path = /obj/item/clothing/under/syndicate/cosmetic + +// Trekie things +//TOS +/datum/gear/trekcmdtos + 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/trekmedscitos + 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/trekengtos + 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") + +//TNG +/datum/gear/trekcmdtng + 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/trekmedscitng + 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/trekengtng + 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/trekcmdvoy + 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/trekmedscivoy + 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/trekengvoy + 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/trekcmdds9 + 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/trekmedscids9 + 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/trekengds9 + 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/trekcmdent + 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/trekmedscient + 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/trekengent + 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") diff --git a/modular_citadel/code/modules/client/loadout/uniform_trek.dm b/modular_citadel/code/modules/client/loadout/uniform_trek.dm deleted file mode 100644 index 5667a355fe..0000000000 --- a/modular_citadel/code/modules/client/loadout/uniform_trek.dm +++ /dev/null @@ -1,132 +0,0 @@ -// 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") - diff --git a/tgstation.dme b/tgstation.dme index 15e6d899c5..f79ca52b3c 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2696,7 +2696,6 @@ #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"