From 9215bb900b70c4397483879dfe14795486e7efb5 Mon Sep 17 00:00:00 2001 From: Braiden Date: Fri, 24 Jul 2020 16:31:05 -0500 Subject: [PATCH] coding completed belted version of all department cloaks, including three new claoks (Cheif of Sec, Warden, Janitor) --- .../loadout/loadout_xeno_yw.dm | 173 +++++++++++++++++- .../clothing/suits/aliens/seromi_yw.dm | 92 +++++----- 2 files changed, 218 insertions(+), 47 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm index 1a8c8ef01a..960c09203e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm @@ -32,4 +32,175 @@ for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard)) var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/beltcloak + display_name = "belted cloak selection (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/beltcloak/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/beltcloak/standard)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/standard/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/uniform/beltcloakcolor/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + +/datum/gear/suit/cloakcolor + display_name = "belted cloak, recolorable (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/dept/beltcloak/ + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/dept/beltcloak/wrdn + display_name = "warden belted cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn + allowed_roles = list("Head of Security","Warden") + +/datum/gear/suit/dept/beltcloak/cs + display_name = "Chief of Security belted cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cs + allowed_roles = list("Head of Security") + +/datum/gear/suit/dept/beltcloak/jani + display_name = "janitor belted cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani + allowed_roles = list("Janitor") + +/datum/gear/suit/dept/cloak/command/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/command,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/cargo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/mining/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/qm/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/security/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/service/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/service,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/engineer/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/eningeer)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/atmos/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/research/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/robo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/cmo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/medical/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/chemistry/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/virology/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/paramedic/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/para,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/iaa/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa)) + var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) diff --git a/code/modules/clothing/suits/aliens/seromi_yw.dm b/code/modules/clothing/suits/aliens/seromi_yw.dm index c34104ca93..f2ace74cee 100644 --- a/code/modules/clothing/suits/aliens/seromi_yw.dm +++ b/code/modules/clothing/suits/aliens/seromi_yw.dm @@ -325,127 +325,127 @@ body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_orange - name = "black and orange cloak" + name = "black belted cloak (orange)" icon_state = "tesh_beltcloak_bo" item_state = "tesh_beltcloak_bo" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_grey - name = "black and grey cloak" + name = "black belted cloak" icon_state = "tesh_beltcloak_bg" item_state = "tesh_beltcloak_bg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_midgrey - name = "black and medium grey cloak" + name = "black belted cloak (medium grey)" icon_state = "tesh_beltcloak_bmg" item_state = "tesh_beltcloak_bmg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_lightgrey - name = "black and light grey cloak" + name = "black belted cloak (light grey)" icon_state = "tesh_beltcloak_blg" item_state = "tesh_beltcloak_blg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_white - name = "black and white cloak" + name = "black belted cloak (white)" icon_state = "tesh_beltcloak_bw" item_state = "tesh_beltcloak_bw" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_red - name = "black and red cloak" + name = "black belted cloak (red)" icon_state = "tesh_beltcloak_br" item_state = "tesh_beltcloak_br" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black - name = "black cloak" + name = "black simple belted cloak" icon_state = "tesh_beltcloak_bn" item_state = "tesh_beltcloak_bn" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_yellow - name = "black and yellow cloak" + name = "black belted cloak (yellow)" icon_state = "tesh_beltcloak_by" item_state = "tesh_beltcloak_by" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_green - name = "black and green cloak" + name = "black belted cloak (green)" icon_state = "tesh_beltcloak_bgr" item_state = "tesh_beltcloak_bgr" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_blue - name = "black and blue cloak" + name = "black belted cloak (blue)" icon_state = "tesh_beltcloak_bbl" item_state = "tesh_beltcloak_bbl" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_purple - name = "black and purple cloak" + name = "black belted cloak (purple)" icon_state = "tesh_beltcloak_bp" item_state = "tesh_beltcloak_bp" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_pink - name = "black and pink cloak" + name = "black belted cloak (pink)" icon_state = "tesh_beltcloak_bpi" item_state = "tesh_beltcloak_bpi" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_brown - name = "black and brown cloak" + name = "black belted cloak (brown)" icon_state = "tesh_beltcloak_bbr" item_state = "tesh_beltcloak_bbr" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange_grey - name = "orange and grey cloak" + name = "orange belted cloak" icon_state = "tesh_beltcloak_og" item_state = "tesh_beltcloak_og" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/rainbow - name = "rainbow cloak" + name = "rainbow belted cloak" icon_state = "tesh_beltcloak_rainbow" item_state = "tesh_beltcloak_rainbow" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/lightgrey_grey - name = "light grey and grey cloak" + name = "light grey belted cloak" icon_state = "tesh_beltcloak_lgg" item_state = "tesh_beltcloak_lgg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey - name = "white and grey cloak" + name = "white belted cloak" icon_state = "tesh_beltcloak_wg" item_state = "tesh_beltcloak_wg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/red_grey - name = "red and grey cloak" + name = "red belted cloak" icon_state = "tesh_beltcloak_rg" item_state = "tesh_beltcloak_rg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange - name = "orange cloak" + name = "orange simple belted cloak" icon_state = "tesh_beltcloak_on" item_state = "tesh_beltcloak_on" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/yellow_grey - name = "yellow and grey cloak" + name = "yellow belted cloak" icon_state = "tesh_beltcloak_yg" item_state = "tesh_beltcloak_yg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/green_grey - name = "green and grey cloak" + name = "green belted cloak" icon_state = "tesh_beltcloak_gg" item_state = "tesh_beltcloak_gg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/blue_grey - name = "blue and grey cloak" + name = "blue belted cloak" icon_state = "tesh_beltcloak_blug" item_state = "tesh_beltcloak_blug" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/purple_grey - name = "purple and grey cloak" + name = "purple belted cloak" icon_state = "tesh_beltcloak_pg" item_state = "tesh_beltcloak_pg" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/pink_grey - name = "pink and grey cloak" + name = "pink belted cloak" icon_state = "tesh_beltcloak_pig" item_state = "tesh_beltcloak_pig" /obj/item/clothing/suit/storage/seromi/beltcloak/standard/brown_grey - name = "brown and grey cloak" + name = "brown belted cloak" icon_state = "tesh_beltcloak_brg" item_state = "tesh_beltcloak_brg" @@ -454,121 +454,121 @@ icon_override = 'icons/mob/species/seromi/teshari_cloak_yw.dmi' /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo - name = "cargo cloak" + name = "cargo belted cloak" desc = "A soft Teshari cloak made for the Cargo department" icon_state = "tesh_beltcloak_car" item_state = "tesh_beltcloak_car" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining - name = "mining cloak" + name = "mining belted cloak" desc = "A soft Teshari cloak made for Mining" icon_state = "tesh_beltcloak_mine" item_state = "tesh_beltcloak_mine" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command - name = "command cloak" + name = "command belted cloak" desc = "A soft Teshari cloak made for the Command department" icon_state = "tesh_beltcloak_comm" item_state = "tesh_beltcloak_comm" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce - name = "cheif engineer cloak" + name = "cheif engineer belted cloak" desc = "A soft Teshari cloak made the Chief Engineer" icon_state = "tesh_beltcloak_ce" item_state = "tesh_beltcloak_ce" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/eningeer - name = "engineering cloak" + name = "engineering belted cloak" desc = "A soft Teshari cloak made for the Engineering department" icon_state = "tesh_beltcloak_engie" item_state = "tesh_beltcloak_engie" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos - name = "atmospherics cloak" + name = "atmospherics belted cloak" desc = "A soft Teshari cloak made for the Atmospheric Technician" icon_state = "tesh_beltcloak_atmos" item_state = "tesh_beltcloak_atmos" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo - name = "chief medical officer cloak" + name = "chief medical belted officer cloak" desc = "A soft Teshari cloak made the Cheif Medical Officer" icon_state = "tesh_beltcloak_cmo" item_state = "tesh_beltcloak_cmo" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical - name = "medical cloak" + name = "medical belted cloak" desc = "A soft Teshari cloak made for the Medical department" icon_state = "tesh_beltcloak_doc" item_state = "tesh_beltcloak_doc" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry - name = "chemist cloak" + name = "chemist belted cloak" desc = "A soft Teshari cloak made for the Chemist" icon_state = "tesh_beltcloak_chem" item_state = "tesh_beltcloak_chem" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro - name = "virologist cloak" + name = "virologist belted cloak" desc = "A soft Teshari cloak made for the Virologist" icon_state = "tesh_beltcloak_viro" item_state = "tesh_beltcloak_viro" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para - name = "paramedic cloak" + name = "paramedic belted cloak" desc = "A soft Teshari cloak made for the Paramedic" icon_state = "tesh_beltcloak_para" item_state = "tesh_beltcloak_para" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci - name = "scientist cloak" + name = "scientist belted cloak" desc = "A soft Teshari cloak made for the Science department" icon_state = "tesh_beltcloak_sci" item_state = "tesh_beltcloak_sci" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo - name = "roboticist cloak" + name = "roboticist belted cloak" desc = "A soft Teshari cloak made for the Roboticist" icon_state = "tesh_beltcloak_robo" item_state = "tesh_beltcloak_robo" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec - name = "security cloak" + name = "security belted cloak" desc = "A soft Teshari cloak made for the Security department" icon_state = "tesh_beltcloak_sec" item_state = "tesh_beltcloak_sec" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm - name = "quartermaster cloak" + name = "quartermaster belted cloak" desc = "A soft Teshari cloak made for the Quartermaster" icon_state = "tesh_beltcloak_qm" item_state = "tesh_beltcloak_qm" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service - name = "service cloak" + name = "service belted cloak" desc = "A soft Teshari cloak made for the Service department" icon_state = "tesh_beltcloak_serv" item_state = "tesh_beltcloak_serv" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa - name = "internal affairs cloak" + name = "internal affairs belted cloak" desc = "A soft Teshari cloak made for the Internal Affairs Agent" icon_state = "tesh_beltcloak_iaa" item_state = "tesh_beltcloak_iaa" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn - name = "warden cloak" + name = "warden belted cloak" desc = "A soft Teshari cloak made for the Warden" icon_state = "tesh_beltcloak_wrdn" item_state = "tesh_beltcloak_wrdn" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce - name = "security chief cloak" +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cs + name = "security chief belted cloak" desc = "A soft Teshari cloak made for the Head of Security" icon_state = "tesh_beltcloak_ce" item_state = "tesh_beltcloak_ce" /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani - name = "janitor cloak" + name = "janitor belted cloak" desc = "A soft Teshari cloak made for the Janitor" icon_state = "tesh_beltcloak_jani" item_state = "tesh_beltcloak_jani" \ No newline at end of file