cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes loadout gear tweaks a bit more modular (#8668)

Browse Source
This commit is contained in:
Alberyk
2020-04-19 17:42:32 -03:00
committed by GitHub
parent 62625ae355
commit 32ce108eb7
21 changed files with 109 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preference_setup/loadout/_defines.dm Normal file
View File

@@ -0,0 +1,4 @@
#define GEAR_NO_SELECTION 0
#define GEAR_HAS_COLOR_SELECTION 1
#define GEAR_HAS_NAME_SELECTION 2
#define GEAR_HAS_DESC_SELECTION 4

8
code/modules/client/preference_setup/loadout/loadout.dm
View File

@@ -236,13 +236,19 @@ var/list/gear_datums = list()
var/faction //Is this item whitelisted for a faction?
var/sort_category = "General"
var/list/gear_tweaks = list() //List of datums which will alter the item after it has been spawned.
var/flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
/datum/gear/New()
..()
if(!description)
var/obj/O = path
description = initial(O.desc)
gear_tweaks = list(gear_tweak_free_name, gear_tweak_free_desc)
if(flags & GEAR_HAS_COLOR_SELECTION)
gear_tweaks += list(gear_tweak_free_color_choice)
if(flags & GEAR_HAS_NAME_SELECTION)
gear_tweaks += list(gear_tweak_free_name)
if(flags & GEAR_HAS_DESC_SELECTION)
gear_tweaks += list(gear_tweak_free_desc)
/datum/gear_data
var/path

53
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -7,19 +7,12 @@
/datum/gear/accessory/suspenders
display_name = "suspenders"
path = /obj/item/clothing/accessory/suspenders
/datum/gear/accessory/suspenders/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/waistcoat
display_name = "waistcoat"
path = /obj/item/clothing/accessory/wcoat_rec
/datum/gear/accessory/waistcoat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/armband
display_name = "armband selection"
@@ -82,10 +75,7 @@
/datum/gear/accessory/bowtie
display_name = "bowtie"
path = /obj/item/clothing/accessory/tie/bowtie
/datum/gear/accessory/bowtie/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/brown_vest
display_name = "webbing, engineering"
@@ -126,10 +116,7 @@
display_name = "drop pouches, simple"
path = /obj/item/clothing/accessory/storage/pouches/colour
cost = 2
/datum/gear/accessory/pouches/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/overalls_mining
display_name = "overalls, mining"
@@ -146,34 +133,22 @@
/datum/gear/accessory/sweater
display_name = "sweater"
path = /obj/item/clothing/accessory/sweater
/datum/gear/accessory/sweater/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/dressshirt
display_name = "dress shirt"
path = /obj/item/clothing/accessory/dressshirt
/datum/gear/accessory/dressshirt/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/dressshirt_r
display_name = "dress shirt, rolled up"
path = /obj/item/clothing/accessory/dressshirt_r
/datum/gear/accessory/dressshirt_r/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/longsleeve
display_name = "long-sleeved shirt"
path = /obj/item/clothing/accessory/longsleeve
/datum/gear/accessory/longsleeve/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/longsleeve_s
display_name = "long-sleeved shirt, striped"
@@ -189,10 +164,7 @@
/datum/gear/accessory/tshirt
display_name = "t-shirt"
path = /obj/item/clothing/accessory/tshirt
/datum/gear/accessory/tshirt/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/silversun
display_name = "silversun floral shirt selection"
@@ -209,6 +181,7 @@
/datum/gear/accessory/scarf
display_name = "scarf selection"
path = /obj/item/clothing/accessory/scarf
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/scarf/New()
..()
@@ -216,7 +189,6 @@
scarfs["plain scarf"] = /obj/item/clothing/accessory/scarf
scarfs["zebra scarf"] = /obj/item/clothing/accessory/scarf/zebra
gear_tweaks += new/datum/gear_tweak/path(scarfs)
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/accessory/chaps
display_name = "chaps, brown"
@@ -272,7 +244,4 @@
/datum/gear/accessory/sleeve_patch
display_name = "shoulder sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch
/datum/gear/accessory/sleeve_patch/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION

5
code/modules/client/preference_setup/loadout/loadout_general.dm
View File

@@ -131,10 +131,7 @@
/datum/gear/towel
display_name = "towel"
path = /obj/item/towel
/datum/gear/towel/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/checkers
display_name = "checkers game kit"

5
code/modules/client/preference_setup/loadout/loadout_gloves.dm
View File

@@ -30,10 +30,7 @@
/datum/gear/gloves/evening
display_name = "evening gloves"
path = /obj/item/clothing/gloves/evening
/datum/gear/gloves/evening/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/gloves/ring
display_name = "ring selection"

32
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -57,10 +57,7 @@
/datum/gear/head/beret/color
display_name = "beret (colorable)"
path = /obj/item/clothing/head/beret/misc
/datum/gear/head/beret/color/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/beret/sec
display_name = "beret, security"
@@ -109,10 +106,7 @@
/datum/gear/head/hairflower
display_name = "hair flower pin (colorable)"
path = /obj/item/clothing/head/pin/flower/white
/datum/gear/head/hairflower/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/flowercrown
display_name = "flowercrown selection"
@@ -215,26 +209,17 @@
/datum/gear/head/headbando
display_name = "basic headband"
path = /obj/item/clothing/head/headbando
/datum/gear/head/headbando/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/beanie
display_name = "beanie"
path = /obj/item/clothing/head/beanie
/datum/gear/head/beanie/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/loose_beanie
display_name = "loose beanie"
path = /obj/item/clothing/head/beanie_loose
/datum/gear/head/loose_beanie/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/nonla
display_name = "non la hat"
@@ -244,6 +229,7 @@
display_name = "IAC Beret"
path = /obj/item/clothing/head/soft/iacberet
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident")
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/circuitry
display_name = "headwear, circuitry (empty)"
@@ -252,6 +238,7 @@
/datum/gear/head/tcfl
display_name = "tcfl hat selection"
path = /obj/item/clothing/head/legion_beret
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/tcfl/New()
..()
@@ -263,7 +250,4 @@
/datum/gear/head/padded_cap
display_name = "padded cap"
path = /obj/item/clothing/head/padded
/datum/gear/head/padded_cap/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION

7
code/modules/client/preference_setup/loadout/loadout_mask.dm
View File

@@ -19,9 +19,4 @@
/datum/gear/mask/cloth
display_name = "cloth mask"
path = /obj/item/clothing/mask/cloth
/datum/gear/mask/cloth/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION

5
code/modules/client/preference_setup/loadout/loadout_religion.dm
View File

@@ -2,6 +2,7 @@
display_name = "trinary perfection robes"
path = /obj/item/clothing/suit/trinary_robes
sort_category = "Religion"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/religion/trinary/mask
display_name = "trinary perfection mask"
@@ -18,3 +19,7 @@
/datum/gear/religion/rosary
display_name = "rosary"
path = /obj/item/clothing/accessory/rosary
/datum/gear/religion/rosary
display_name = "rosary"
path = /obj/item/clothing/accessory/rosary

10
code/modules/client/preference_setup/loadout/loadout_shoes.dm
View File

@@ -87,18 +87,12 @@
/datum/gear/shoes/heels
display_name = "high heels"
path = /obj/item/clothing/shoes/heels
/datum/gear/shoes/heels/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/shoes/tongs
display_name = "flip flops"
path = /obj/item/clothing/shoes/sandal/flipflop
/datum/gear/shoes/tongs/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/shoes/hitops
display_name = "high-top selection"

40
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -12,10 +12,7 @@
slot = slot_wear_suit
sort_category = "Suits and Overwear"
cost = 2
/datum/gear/suit/colorapron/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/leather
display_name = "jacket selection"
@@ -70,27 +67,18 @@
/datum/gear/suit/hoodie
display_name = "hoodie"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie
/datum/gear/suit/hoodie/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/labcoat
display_name = "labcoat"
path = /obj/item/clothing/suit/storage/toggle/labcoat
/datum/gear/suit/labcoat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/overalls
display_name = "overalls"
path = /obj/item/clothing/suit/apron/overalls
cost = 1
/datum/gear/suit/overalls/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/surgeryapron
display_name = "surgical apron"
@@ -127,12 +115,7 @@
/datum/gear/suit/suitjacket
display_name = "suit jacket"
path = /obj/item/clothing/suit/storage/toggle/suitjacket
/datum/gear/suit/suitjacket/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/trenchcoats
display_name = "trenchcoat selection"
@@ -240,11 +223,13 @@
/datum/gear/suit/dominia_cape
display_name = "dominia cape"
path = /obj/item/clothing/accessory/poncho/dominia_cape
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/dominia
display_name = "dominia great coat selection"
description = "A selection of Dominian coats."
path = /obj/item/clothing/suit/storage/toggle/dominia
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/dominia/New()
..()
@@ -258,6 +243,7 @@
display_name = "Tau Ceti Foreign Legion jacket selection"
description = "A selection of fine, surplus jackets of the Foreign Legion."
path = /obj/item/clothing/suit/storage/legion
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/tcfl/New()
..()
@@ -286,10 +272,7 @@
/datum/gear/suit/miscellaneous/peacoat
display_name = "peacoat"
path = /obj/item/clothing/suit/storage/toggle/peacoat
/datum/gear/suit/miscellaneous/peacoat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/varsity
display_name = "varsity jacket selection"
@@ -331,7 +314,4 @@
display_name = "cardigan"
path = /obj/item/clothing/suit/cardigan
cost = 1 // has no pockets or any use whatsoever anyway
/datum/gear/suit/cardigan/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION

14
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -60,6 +60,7 @@
display_name = "skirt selection"
description = "A selection of skirts."
path = /obj/item/clothing/under/skirt
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/uniform/skirt/New()
..()
@@ -70,7 +71,6 @@
skirts["pencil skirt"] = /obj/item/clothing/under/skirt/pencil
skirts["swept skirt"] = /obj/item/clothing/under/skirt/swept
gear_tweaks += new/datum/gear_tweak/path(skirts)
gear_tweaks += list(gear_tweak_free_color_choice)
/datum/gear/uniform/suit
display_name = "suit selection"
@@ -153,10 +153,7 @@
/datum/gear/uniform/customdress
display_name = "evening gown"
path = /obj/item/clothing/under/dress/dress_evening
/datum/gear/uniform/customdress/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/uniform/uniform_hop
display_name = "uniform, HoP dress"
@@ -218,6 +215,7 @@
/datum/gear/uniform/colorpants
display_name = "pants (recolorable)"
path = /obj/item/clothing/under/pants/dress
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/uniform/colorpants/New()
..()
@@ -225,7 +223,6 @@
colorpants["dress pants"] = /obj/item/clothing/under/pants/dress
colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
gear_tweaks += new/datum/gear_tweak/path(colorpants)
gear_tweaks += list(gear_tweak_free_color_choice)
/datum/gear/uniform/turtleneck
display_name = "tacticool turtleneck"
@@ -249,10 +246,7 @@
/datum/gear/uniform/miscellaneous/kimono
display_name = "kimono"
path = /obj/item/clothing/under/kimono
/datum/gear/uniform/miscellaneous/kimono/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/uniform/miscellaneous/greensuit
display_name = "green formal uniform"

15
code/modules/client/preference_setup/loadout/loadout_utility.dm
View File

@@ -79,26 +79,17 @@
/datum/gear/utility/wallet_colourable
display_name = "wallet, colourable"
path = /obj/item/storage/wallet/colourable
/datum/gear/utility/wallet_colourable/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/utility/wallet_purse
display_name = "wallet, purse"
path = /obj/item/storage/wallet/purse
/datum/gear/utility/wallet_purse/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/utility/lanyard
display_name = "lanyard"
path = /obj/item/storage/wallet/lanyard
/datum/gear/utility/lanyard/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/*
/datum/gear/utility/cheaptablet

5
code/modules/client/preference_setup/loadout/loadout_xeno.dm
View File

@@ -9,10 +9,7 @@
path = /obj/item/clothing/shoes/footwraps
sort_category = "Xenowear"
whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
/datum/gear/shoes/footwraps/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/shoes/toeless
display_name = "toe-less jackboots"

26
code/modules/client/preference_setup/loadout/loadout_xeno/human.dm
View File

@@ -3,10 +3,7 @@
path = /obj/item/clothing/under/offworlder
whitelisted = list("Off-Worlder Human")
sort_category = "Xenowear - Human"
/datum/gear/uniform/offworlder/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/uniform/offworlder/dress
display_name = "CR dress"
@@ -21,20 +18,14 @@
path = /obj/item/clothing/glasses/spiffygogs/offworlder
whitelisted = list("Off-Worlder Human")
sort_category = "Xenowear - Human"
/datum/gear/eyes/glasses/offworlder/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/offworlder
display_name = "legbrace"
path = /obj/item/clothing/accessory/offworlder/bracer
whitelisted = list("Off-Worlder Human")
sort_category = "Xenowear - Human"
/datum/gear/accessory/offworlder/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/offworlder/venter
display_name = "venter assembly"
@@ -67,10 +58,7 @@
/datum/gear/mask/offworlder/overmask
display_name = "overmask"
path = /obj/item/clothing/mask/breath/offworlder
/datum/gear/mask/offworlder/overmask/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/mask/offworlder/overmask/veil
display_name = "starveil"
@@ -79,16 +67,14 @@
/datum/gear/mask/offworlder/overmask/scarf
display_name = "pioneer scarf"
path = /obj/item/clothing/mask/offworlder
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/gloves/offworlder
display_name = "starmitts"
path = /obj/item/clothing/gloves/offworlder
whitelisted = list("Off-Worlder Human")
sort_category = "Xenowear - Human"
/datum/gear/gloves/offworlder/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/offworlder_rig
display_name = "exo-stellar skeleton"

16
code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm
View File

@@ -4,6 +4,7 @@
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 - IPC"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/goldenchains/New()
..()
@@ -19,6 +20,7 @@
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 - IPC"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/goldencrests/New()
..()
@@ -34,6 +36,7 @@
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 - IPC"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/gloves/armchains/New()
..()
@@ -49,6 +52,7 @@
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 - IPC"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/gloves/bracers/New()
..()
@@ -64,6 +68,7 @@
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 - IPC"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/ears/antennae/New()
..()
@@ -76,9 +81,15 @@
antenna["antenna, double"] = /obj/item/clothing/head/antenna/double
antenna["antenna, left"] = /obj/item/clothing/head/antenna/double/left
antenna["antenna, right"] = /obj/item/clothing/head/antenna/double/right
antenna["antenna, trinary perfection"] = /obj/item/clothing/head/antenna/trinary_halo
gear_tweaks += new/datum/gear_tweak/path(antenna)
gear_tweaks += list(gear_tweak_free_color_choice)
/datum/gear/ears/trinary_halo
display_name = "trinary perfection antenna"
path = /obj/item/clothing/head/antenna/trinary_halo
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 - IPC"
flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/ears/headlights
display_name = "headlights"
@@ -93,6 +104,7 @@
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 - IPC"
allowed_roles = list("Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet")
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/idris/New()
..()

3
code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm
View File

@@ -74,6 +74,7 @@
path = /obj/item/clothing/under/skrell/qeblak
whitelisted = list("Skrell")
sort_category = "Xenowear - Skrell"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/stellascope
display_name = "stellascope"
@@ -92,6 +93,7 @@
path = /obj/item/clothing/ears/skrell/goop
whitelisted = list("Skrell")
sort_category = "Xenowear - Skrell"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/ears/skrell/goop/New()
..()
@@ -100,7 +102,6 @@
algae["glowing algae(stripes)"] = /obj/item/clothing/ears/skrell/goop/stripes
algae["glowing algae(circles)"] = /obj/item/clothing/ears/skrell/goop/circles
gear_tweaks += new/datum/gear_tweak/path(algae)
gear_tweaks += list(gear_tweak_free_color_choice)
/datum/gear/mask/skrell
display_name = "skrell gill cover"

8
code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
View File

@@ -42,6 +42,7 @@
path = /obj/item/clothing/suit/storage/hooded/tajaran/priest
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/tajara_priest/New()
..()
@@ -141,6 +142,7 @@
path = /obj/item/clothing/accessory/tajaran_wrap
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/accessory/tajara_wrap/New()
..()
@@ -154,6 +156,7 @@
path = /obj/item/clothing/accessory/tajaran_pelt
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/mask/tajara
display_name = "sun sister veil"
@@ -161,6 +164,7 @@
cost = 1
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/shoes/tajara
display_name = "native tajaran foot-wear"
@@ -173,10 +177,12 @@
path = /obj/item/clothing/accessory/badge/hadii_card
sort_category = "Xenowear - Tajara"
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/gloves/shumalia_belt
display_name = "hammer buckle belt"
description = "A leather belt adorned by a hammer shaped buckle, worn by priesthood and worshippers of Shumaila."
path = /obj/item/storage/belt/shumaila_buckle
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
sort_category = "Xenowear - Tajara"
flags = GEAR_HAS_DESC_SELECTION

13
code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
View File

@@ -44,10 +44,7 @@
path = /obj/item/clothing/under/unathi
whitelisted = list("Unathi", "Aut'akh Unathi")
sort_category = "Xenowear - Unathi"
/datum/gear/uniform/unathi/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/autakh_engineering
display_name = "engineering grasper"
@@ -57,6 +54,7 @@
sort_category = "Xenowear - Unathi"
cost = 3
allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Roboticist")
flags = GEAR_NO_SELECTION
/datum/gear/autakh_mining
display_name = "mining grasper"
@@ -66,6 +64,7 @@
sort_category = "Xenowear - Unathi"
cost = 3
allowed_roles = list("Shaft Miner")
flags = GEAR_NO_SELECTION
/datum/gear/autakh_medical
display_name = "medical grasper"
@@ -75,6 +74,7 @@
sort_category = "Xenowear - Unathi"
cost = 3
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
flags = GEAR_NO_SELECTION
/datum/gear/autakh_security
display_name = "security grasper"
@@ -84,6 +84,7 @@
sort_category = "Xenowear - Unathi"
cost = 3
allowed_roles = list("Security Officer", "Head of Security", "Warden")
flags = GEAR_NO_SELECTION
/datum/gear/uniform/unathi/jizixi
display_name = "jizixi dress"
@@ -128,6 +129,7 @@
cost = 1
whitelisted = list("Unathi")
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/unathi/wrapping_body
display_name = "thakh shaman body wrappings"
@@ -135,4 +137,5 @@
path = /obj/item/clothing/suit/unathi/mantle/wrapping
cost = 1
whitelisted = list("Unathi")
sort_category = "Xenowear - Unathi"
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_DESC_SELECTION

35
code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm
View File

@@ -25,10 +25,7 @@
cost = 1
whitelisted = list("Vaurca Worker", "Vaurca Warrior")
sort_category = "Xenowear - Vaurca"
/datum/gear/mask/vaurca_expression/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/mask/vaurca_expression/skrell
display_name = "skrell expression mask"
@@ -39,10 +36,7 @@
path = /obj/item/clothing/head/shaper
whitelisted = list("Vaurca Worker", "Vaurca Warrior")
sort_category = "Xenowear - Vaurca"
/datum/gear/head/shaper/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/cape
display_name = "tunnel cloak"
@@ -50,10 +44,7 @@
cost = 1
whitelisted = list("Vaurca Worker", "Vaurca Warrior")
sort_category = "Xenowear - Vaurca"
/datum/gear/cape/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/vaurca_robe
display_name = "hive cloak"
@@ -77,10 +68,7 @@
path = /obj/item/clothing/under/vaurca
whitelisted = list("Vaurca Worker", "Vaurca Warrior")
sort_category = "Xenowear - Vaurca"
/datum/gear/uniform/vaurca/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/vaurca
display_name = "shaper robes"
@@ -89,20 +77,14 @@
whitelisted = list("Vaurca Worker", "Vaurca Warrior")
sort_category = "Xenowear - Vaurca"
cost = 1
/datum/gear/suit/vaurca/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/shoes/vaurca
display_name = "vaurca shoes"
path = /obj/item/clothing/shoes/vaurca
whitelisted = list("Vaurca Worker", "Vaurca Warrior")
sort_category = "Xenowear - Vaurca"
/datum/gear/shoes/vaurca/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/vaurca_shroud
display_name = "vaurcan shroud"
@@ -128,7 +110,4 @@
cost = 1
whitelisted = list("Vaurca Worker", "Vaurca Warrior")
sort_category = "Xenowear - Vaurca"
/datum/gear/suit/vaurca_mantle/New()
..()
gear_tweaks += gear_tweak_free_color_choice
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION