diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index ccd61969484..28c41037998 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -91,7 +91,7 @@ /datum/gear/uniform/pants/New() ..() var/list/pants = list() - for(var/obj/item/clothing/under/pants/pant_type as anything in typesof(/obj/item/clothing/under/pants)) + for(var/obj/item/clothing/under/pants/pant_type as anything in (typesof(/obj/item/clothing/under/pants) - typesof(/obj/item/clothing/under/pants/altevian))) pants[initial(pant_type.name)] = pant_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index ab32d3c2f3f..f4efe249e3d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -36,7 +36,7 @@ /datum/gear/uniform/job_khi/med display_name = "khi uniform, med" path = /obj/item/clothing/under/rank/khi/med - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist") /datum/gear/uniform/job_khi/eng display_name = "khi uniform, eng" @@ -280,3 +280,38 @@ Talon jumpsuit display_name = "undersuit, command (SM/HoP)" allowed_roles = list("Site Manager", "Head of Personnel") path = /obj/item/clothing/under/undersuit/command + +//Altevian Uniforms +/datum/gear/uniform/job_altevian/cmd + display_name = "altevian uniform, cmd" + path = /obj/item/clothing/under/pants/altevian/command + allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") + +/datum/gear/uniform/job_altevian/sec + display_name = "altevian uniform, sec" + path = /obj/item/clothing/under/pants/altevian/security + allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") + +/datum/gear/uniform/job_altevian/med + display_name = "altevian uniform, med" + path = /obj/item/clothing/under/pants/altevian/medical + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist") + +/datum/gear/uniform/job_altevian/eng + display_name = "altevian uniform, eng" + path = /obj/item/clothing/under/pants/altevian/engineering + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") + +/datum/gear/uniform/job_altevian/sci + display_name = "altevian uniform, sci" + path = /obj/item/clothing/under/pants/altevian/science + allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") + +/datum/gear/uniform/job_altevian/crg + display_name = "altevian uniform, cargo" + path = /obj/item/clothing/under/pants/altevian/cargo + allowed_roles = list("Quartermaster", "Cargo Technician", "Shaft Miner") + +/datum/gear/uniform/job_altevian/civ + display_name = "altevian uniform, civ" + path = /obj/item/clothing/under/pants/altevian diff --git a/code/modules/clothing/under/accessories/altevian_vr.dm b/code/modules/clothing/under/accessories/altevian_vr.dm new file mode 100644 index 00000000000..ec3322d185b --- /dev/null +++ b/code/modules/clothing/under/accessories/altevian_vr.dm @@ -0,0 +1,78 @@ +/obj/item/clothing/accessory/jacket/altevian + name = "Altevian Hegemony Civilian Jacket" + desc = "A form fitting jacket that looks more for fashion than for work with it leaving ones mid-riff exposed to the outside elements, but when looking so good it isn't really ones worry by that point! " + icon = 'icons/inventory/accessory/item_vr.dmi' + icon_override = 'icons/inventory/accessory/mob_vr.dmi' + icon_state = "altevian-jacket-civ" + item_state = "altevian-jacket-civ" + overlay_state = "altevian-jacket-civ" + +/obj/item/clothing/accessory/jacket/altevian/command + name = "Altevian Hegemony Command Jacket" + icon_state = "altevian-jacket-com" + item_state = "altevian-jacket-com" + overlay_state = "altevian-jacket-com" + +/obj/item/clothing/accessory/jacket/altevian/security + name = "Altevian Hegemony Security Jacket" + icon_state = "altevian-jacket-sec" + item_state = "altevian-jacket-sec" + overlay_state = "altevian-jacket-sec" + +/obj/item/clothing/accessory/jacket/altevian/medical + name = "Altevian Hegemony Command Jacket" + icon_state = "altevian-jacket-med" + item_state = "altevian-jacket-med" + overlay_state = "altevian-jacket-med" + +/obj/item/clothing/accessory/jacket/altevian/engineering + name = "Altevian Hegemony Engineering Jacket" + icon_state = "altevian-jacket-eng" + item_state = "altevian-jacket-eng" + overlay_state = "altevian-jacket-eng" + +/obj/item/clothing/accessory/jacket/altevian/science + name = "Altevian Hegemony Science Jacket" + icon_state = "altevian-jacket-sci" + item_state = "altevian-jacket-sci" + overlay_state = "altevian-jacket-sci" + +/obj/item/clothing/accessory/jacket/altevian/cargo + name = "Altevian Hegemony Cargo Jacket" + icon_state = "altevian-jacket-cargo" + item_state = "altevian-jacket-cargo" + overlay_state = "altevian-jacket-cargo" + + +/obj/item/clothing/accessory/scarf/altevian + name = "Blue Comfortable Scarf" + desc = "A scarf made of synthetic material that would be common among a people who don't really have the leisure of organic crops for luxury goods. They seemed to of refined this process though and one wouldn't be able to tell the difference between it and ones made normally." + icon = 'icons/inventory/accessory/item_vr.dmi' + icon_override = 'icons/inventory/accessory/mob_vr.dmi' + icon_state = "altevian-scarf-blue" + item_state = "altevian-scarf-blue" + overlay_state = "altevian-scarf-blue" + +/obj/item/clothing/accessory/scarf/altevian/red + name = "Red Comfortable Scarf" + icon_state = "altevian-scarf-red" + item_state = "altevian-scarf-red" + overlay_state = "altevian-scarf-red" + +/obj/item/clothing/accessory/scarf/altevian/yellow + name = "Yellow Comfortable Scarf" + icon_state = "altevian-scarf-yellow" + item_state = "altevian-scarf-yellow" + overlay_state = "altevian-scarf-yellow" + +/obj/item/clothing/accessory/scarf/altevian/green + name = "Green Comfortable Scarf" + icon_state = "altevian-scarf-green" + item_state = "altevian-scarf-green" + overlay_state = "altevian-scarf-green" + +/obj/item/clothing/accessory/scarf/altevian/purple + name = "Purple Comfortable Scarf" + icon_state = "altevian-scarf-purple" + item_state = "altevian-scarf-purple" + overlay_state = "altevian-scarf-purple" \ No newline at end of file diff --git a/code/modules/clothing/under/altevian_vr.dm b/code/modules/clothing/under/altevian_vr.dm new file mode 100644 index 00000000000..51f3bbef3b1 --- /dev/null +++ b/code/modules/clothing/under/altevian_vr.dm @@ -0,0 +1,46 @@ +/obj/item/clothing/under/pants/altevian + name = "Altevian Hegemony Civilian Pants" + desc = "An extremely comfortable set of clothing that's made to help people handle their day to day work around the fleets with little to no discomfort." + icon = 'icons/inventory/uniform/item_vr.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' + icon_state = "altevian-pants-civ" + worn_state = "altevian-pants-civ" + gender = PLURAL + body_parts_covered = LOWER_TORSO|LEGS + starting_accessories = list(/obj/item/clothing/accessory/jacket/altevian) + +/obj/item/clothing/under/pants/altevian/command + name = "Altevian Hegemony Command Pants" + icon_state = "altevian-pants-com" + worn_state = "altevian-pants-com" + starting_accessories = list(/obj/item/clothing/accessory/jacket/altevian/command) + +/obj/item/clothing/under/pants/altevian/security + name = "Altevian Hegemony Security Pants" + icon_state = "altevian-pants-sec" + worn_state = "altevian-pants-sec" + starting_accessories = list(/obj/item/clothing/accessory/jacket/altevian/security) + +/obj/item/clothing/under/pants/altevian/engineering + name = "Altevian Hegemony Engineering Pants" + icon_state = "altevian-pants-eng" + worn_state = "altevian-pants-eng" + starting_accessories = list(/obj/item/clothing/accessory/jacket/altevian/engineering) + +/obj/item/clothing/under/pants/altevian/medical + name = "Altevian Hegemony Medical Pants" + icon_state = "altevian-pants-med" + worn_state = "altevian-pants-med" + starting_accessories = list(/obj/item/clothing/accessory/jacket/altevian/medical) + +/obj/item/clothing/under/pants/altevian/science + name = "Altevian Hegemony Science Pants" + icon_state = "altevian-pants-sci" + worn_state = "altevian-pants-sci" + starting_accessories = list(/obj/item/clothing/accessory/jacket/altevian/science) + +/obj/item/clothing/under/pants/altevian/cargo + name = "Altevian Hegemony Cargo Pants" + icon_state = "altevian-pants-cargo" + worn_state = "altevian-pants-cargo" + starting_accessories = list(/obj/item/clothing/accessory/jacket/altevian/cargo) diff --git a/icons/inventory/accessory/item_vr.dmi b/icons/inventory/accessory/item_vr.dmi index b1e6a60a0e0..91e3c4e7d63 100644 Binary files a/icons/inventory/accessory/item_vr.dmi and b/icons/inventory/accessory/item_vr.dmi differ diff --git a/icons/inventory/accessory/mob_vr.dmi b/icons/inventory/accessory/mob_vr.dmi index cab7916a325..a738336ba1f 100644 Binary files a/icons/inventory/accessory/mob_vr.dmi and b/icons/inventory/accessory/mob_vr.dmi differ diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi index 4e92cd67101..305bdc3efbd 100644 Binary files a/icons/inventory/uniform/item_vr.dmi and b/icons/inventory/uniform/item_vr.dmi differ diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi index e4295298d37..f04df19f3e3 100644 Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ