diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index bc64168142..8b6b8055bd 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -97,6 +97,48 @@ icon_state = "trek_ds9_medsci" item_state = "b_suit" +//Orvilike (Orville-inspired clothing with TOS-like color code) +/obj/item/clothing/under/trek/command/orv + desc = "An uniform worn by command officers since 2420s." + icon_state = "orv_com" + +/obj/item/clothing/under/trek/engsec/orv + desc = "An uniform worn by operations officers since 2420s." + icon_state = "orv_ops" + +/obj/item/clothing/under/trek/medsci/orv + desc = "An uniform worn by medsci officers since 2420s." + icon_state = "orv_medsci" + +//Orvilike Extra (Ditto, but expands it for Civilian department with SS13 colors and gives specified command uniform) +//honestly no idea why i added specified comm. uniforms but w/e +/obj/item/clothing/under/trek/command/orv/captain + name = "captain uniform" + desc = "An uniform worn by captains since 2550s." + icon_state = "orv_com_capt" + +/obj/item/clothing/under/trek/command/orv/engsec + name = "operations command uniform" + desc = "An uniform worn by operations command officers since 2550s." + icon_state = "orv_com_ops" + +/obj/item/clothing/under/trek/command/orv/medsci + name = "medsci command uniform" + desc = "An uniform worn by medsci command officers since 2550s." + icon_state = "orv_com_medsci" + +/obj/item/clothing/under/trek/orv + name = "adjutant uniform" + desc = "An uniform worn by adjutants (assistants) since 2550s." + icon_state = "orv_ass" + item_state = "gy_suit" + +/obj/item/clothing/under/trek/orv/service + name = "service uniform" + desc = "An uniform worn by service officers since 2550s." + icon_state = "orv_srv" + item_state = "g_suit" + //The Motion Picture /obj/item/clothing/under/trek/fedutil name = "federation utility uniform" diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 08da540222..7bec0ac3eb 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index 431eebc22e..da94f97895 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 09830f8606..57424c7b99 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index dd7d2cdc4b..28c6e8e8a6 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -82,7 +82,7 @@ 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") + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekcapeng name = "Federation Officer's Cap (Yellow)" diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 64bfd34172..fecf2a4dce 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -161,7 +161,7 @@ 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", + "Medical Doctor","Chemist","Virologist","Paramedic","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 @@ -183,7 +183,7 @@ 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") + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengmov name = "Fed (movie) uniform, Yellow" @@ -210,7 +210,7 @@ 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") + restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengmod name = "Fed (Modern) uniform, Yellow" diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index e9adc317cb..a4d6c2cd09 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -286,7 +286,7 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci restricted_desc = "Medical and Science" - 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","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengtos name = "TOS uniform, ops/sec" @@ -308,7 +308,7 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/next restricted_desc = "Medical and Science" - 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","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengtng name = "TNG uniform, ops/sec" @@ -330,7 +330,7 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/voy restricted_desc = "Medical and Science" - 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","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengvoy name = "VOY uniform, ops/sec" @@ -352,7 +352,7 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/ds9 restricted_desc = "Medical and Science" - 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","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengds9 name = "DS9 uniform, ops/sec" @@ -374,7 +374,7 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/medsci/ent restricted_desc = "Medical and Science" - 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","Paramedic","Geneticist","Research Director","Scientist", "Roboticist") /datum/gear/trekengent name = "ENT uniform, ops/sec" @@ -390,7 +390,7 @@ path = /obj/item/clothing/under/trek/fedutil restricted_desc = "All, barring Service and Civilian" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster", - "Medical Doctor","Chemist","Virologist","Geneticist","Scientist", "Roboticist", + "Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist", "Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer", "Cargo Technician", "Shaft Miner") @@ -405,7 +405,60 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/trek/fedutil/service restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer" - restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor") + restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain") + +//Orvilike +/datum/gear/orvcmd + name = "ORV uniform, cmd" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/command/orv + 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/orvcmd_capt + name = "ORV uniform, capt" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/command/orv/captain + restricted_roles = list("Captain") + +/datum/gear/orvmedsci + name = "ORV uniform, med/sci" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/medsci/orv + restricted_desc = "Medical and Science" + restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist") + +/datum/gear/orvcmd_medsci + name = "ORV uniform, med/sci, cmd" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/command/orv/medsci + restricted_roles = list("Chief Medical Officer", "Research Director") + +/datum/gear/orvops + name = "ORV uniform, ops/sec" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/engsec/orv + 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/orvcmd_ops + name = "ORV uniform, ops/sec, cmd" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/command/orv/engsec + restricted_roles = list("Chief Engineer", "Head of Security") + +/datum/gear/orvass + name = "ORV uniform, assistant" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/orv + restricted_roles = list("Assistant") + +/datum/gear/orvsrv + name = "ORV uniform, service" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/trek/orv/service + restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain") + restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer" //Memes /datum/gear/gear_harnesses @@ -482,4 +535,4 @@ name = "Cheongsam, Red" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/costume/cheongsam/red - cost = 3 \ No newline at end of file + cost = 3