From a5af06ea3dc9d76720b450dfddc46544d653cfc7 Mon Sep 17 00:00:00 2001 From: Werner Date: Wed, 19 Dec 2018 08:24:59 +0100 Subject: [PATCH] Xenogear Groups (#5791) Groups the Xeno Gear into different Loadout groups. Requested and created by Jackboot. I am just supplying the PR. --- .../preference_setup/loadout/loadout_xeno.dm | 66 ++++++++++--------- html/changelogs/Jackboot-Loadout-Groups.yml | 37 +++++++++++ 2 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 html/changelogs/Jackboot-Loadout-Groups.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 23d85f99ddc..cf8a99970d5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -1,3 +1,5 @@ +//Catagories; Xenowear - Unathi / Xenowear - Tajara / Xenowear - Skrell / Xenowear - Vaurca / Xenowear - IPC / Xeno wear + //unathi items /datum/gear/suit/unathi_mantle @@ -5,27 +7,27 @@ path = /obj/item/clothing/suit/unathi/mantle cost = 1 whitelisted = list("Unathi") - sort_category = "Xenowear" + sort_category = "Xenowear - Unathi" /datum/gear/suit/unathi_robe display_name = "roughspun robe (Unathi)" path = /obj/item/clothing/suit/unathi/robe cost = 1 whitelisted = list("Unathi") - sort_category = "Xenowear" + sort_category = "Xenowear - Unathi" /datum/gear/suit/robe_coat display_name = "tzirzi robe (Unathi)" path = /obj/item/clothing/suit/unathi/robe/robe_coat cost = 1 whitelisted = list("Unathi") - sort_category = "Xenowear" + sort_category = "Xenowear - Unathi" /datum/gear/gloves/unathi display_name = "gloves selection (Unathi)" path = /obj/item/clothing/gloves/black/unathi whitelisted = list("Unathi") - sort_category = "Xenowear" + sort_category = "Xenowear - Unathi" /datum/gear/gloves/unathi/New() ..() @@ -44,7 +46,7 @@ display_name = "sinta tunic (Unathi)" path = /obj/item/clothing/under/unathi whitelisted = list("Unathi") - sort_category = "Xenowear" + sort_category = "Xenowear - Unathi" /datum/gear/uniform/unathi/New() ..() @@ -55,7 +57,7 @@ /datum/gear/ears/skrell/chains //Chains display_name = "headtail chain selection (Skrell)" path = /obj/item/clothing/ears/skrell/chain - sort_category = "Xenowear" + sort_category = "Xenowear - Skrell" whitelisted = list("Skrell") /datum/gear/ears/skrell/chains/New() @@ -69,7 +71,7 @@ /datum/gear/ears/skrell/bands display_name = "headtail band selection (Skrell)" path = /obj/item/clothing/ears/skrell/band - sort_category = "Xenowear" + sort_category = "Xenowear - Skrell" whitelisted = list("Skrell") /datum/gear/ears/skrell/bands/New() @@ -83,7 +85,7 @@ /datum/gear/ears/skrell/cloth/short display_name = "short headtail cloth (Skrell)" path = /obj/item/clothing/ears/skrell/cloth_short/black - sort_category = "Xenowear" + sort_category = "Xenowear - Skrell" whitelisted = list("Skrell") /datum/gear/ears/skrell/cloth/short/New() @@ -97,7 +99,7 @@ /datum/gear/ears/skrell/cloth/average display_name = "average headtail cloth (Skrell)" path = /obj/item/clothing/ears/skrell/cloth_average/black - sort_category = "Xenowear" + sort_category = "Xenowear - Skrell" whitelisted = list("Skrell") /datum/gear/ears/skrell/cloth/average/New() @@ -115,21 +117,21 @@ path = /obj/item/clothing/glasses/sunglasses/blinders cost = 2 whitelisted = list("Vaurca Worker", "Vaurca Warrior") - sort_category = "Xenowear" + sort_category = "Xenowear - Vaurca" /datum/gear/mask/vaurca display_name = "mandible garment (Vaurca)" path = /obj/item/clothing/mask/breath/vaurca cost = 1 whitelisted = list("Vaurca Worker", "Vaurca Warrior",) - sort_category = "Xenowear" + sort_category = "Xenowear - Vaurca" /datum/gear/mask/vaurca_expression display_name = "human expression mask (Vaurca)" path = /obj/item/clothing/mask/breath/vaurca/expression cost = 1 whitelisted = list("Vaurca Worker", "Vaurca Warrior",) - sort_category = "Xenowear" + sort_category = "Xenowear - Vaurca" /datum/gear/mask/vaurca_expression/New() ..() @@ -144,14 +146,14 @@ path = /obj/item/weapon/storage/backpack/cloak cost = 1 whitelisted = list("Vaurca Worker", "Vaurca Warrior",) - sort_category = "Xenowear" + sort_category = "Xenowear - Vaurca" /datum/gear/vaurca_robe display_name = "hive cloak (Vaurca)" path = /obj/item/clothing/suit/vaurca cost = 1 whitelisted = list("Vaurca Worker", "Vaurca Warrior",) - sort_category = "Xenowear" + sort_category = "Xenowear - Vaurca" /datum/gear/vaurca_robe/New() ..() @@ -168,7 +170,7 @@ display_name = "gloves selection (Tajara)" path = /obj/item/clothing/gloves/black/tajara whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/gloves/tajara/New() ..() @@ -187,7 +189,7 @@ display_name = "tajara coat selection (Tajara)" path = /obj/item/clothing/suit/storage/tajaran whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/suit/tajara_coat/New() ..() @@ -203,7 +205,7 @@ display_name = "tajara priest robe selection (Tajara)" path = /obj/item/clothing/suit/storage/hooded/tajaran/priest whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/suit/tajara_priest/New() ..() @@ -217,13 +219,13 @@ path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/uniform/tajara display_name = "tajaran uniform selection (Tajara)" path = /obj/item/clothing/under/tajaran whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/uniform/tajara/New() ..() @@ -237,7 +239,7 @@ display_name = "tajaran dress selection (Tajara)" path = /obj/item/clothing/under/dress/tajaran whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/uniform/tajara_dress/New() ..() @@ -254,7 +256,7 @@ display_name = "fur scarf (Tajara)" path = /obj/item/clothing/accessory/tajaran whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/accessory/tajara/New() ..() @@ -274,7 +276,7 @@ display_name = "adhomian headgear selection (Tajara)" path = /obj/item/clothing/head/tajaran/circlet whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/head/tajara/New() ..() @@ -288,7 +290,7 @@ display_name = "marriage wrap (Tajara)" path = /obj/item/clothing/accessory/tajaran_wrap whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/accessory/tajara_wrap/New() ..() @@ -301,19 +303,19 @@ display_name = "ceremonial pelt (Tajara)" path = /obj/item/clothing/accessory/tajaran_pelt whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/mask/tajara display_name = "sun sister veil (Tajara)" path = /obj/item/clothing/mask/tajara cost = 1 whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" /datum/gear/shoes/tajara display_name = "native tajaran foot-wear" path = /obj/item/clothing/shoes/tajara - sort_category = "Xenowear" + sort_category = "Xenowear - Tajara" whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") //other things @@ -347,7 +349,7 @@ path = /obj/item/clothing/head/headchain cost = 1 whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame") - sort_category = "Xenowear" + sort_category = "Xenowear - IPC" /datum/gear/head/goldenchains/New() ..() @@ -362,7 +364,7 @@ path = /obj/item/clothing/head/crest cost = 1 whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame") - sort_category = "Xenowear" + sort_category = "Xenowear - IPC" /datum/gear/head/goldencrests/New() ..() @@ -377,7 +379,7 @@ path = /obj/item/clothing/gloves/armchain cost = 1 whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame") - sort_category = "Xenowear" + sort_category = "Xenowear - IPC" /datum/gear/gloves/armchains/New() ..() @@ -392,7 +394,7 @@ path = /obj/item/clothing/gloves/goldbracer cost = 1 whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame") - sort_category = "Xenowear" + sort_category = "Xenowear - IPC" /datum/gear/gloves/bracers/New() ..() @@ -407,7 +409,7 @@ path = /obj/item/clothing/head/antenna cost = 1 whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame") - sort_category = "Xenowear" + sort_category = "Xenowear - IPC" /datum/gear/ears/antennae/New() ..() @@ -424,4 +426,4 @@ path = /obj/item/device/flashlight/headlights cost = 2 whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame") - sort_category = "Xenowear" \ No newline at end of file + sort_category = "Xenowear - IPC" \ No newline at end of file diff --git a/html/changelogs/Jackboot-Loadout-Groups.yml b/html/changelogs/Jackboot-Loadout-Groups.yml new file mode 100644 index 00000000000..7fa1bad340f --- /dev/null +++ b/html/changelogs/Jackboot-Loadout-Groups.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Jackboot + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Split up the xeno gear into multiple loadout groups."