cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into final_shuttle_touches_and_stuff

Browse Source 
# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
This commit is contained in:
alberyk
2021-12-21 16:51:40 -03:00
parent 654b195c0f c700d6b140
commit 4b32268c1a
375 changed files with 118163 additions and 3628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/03_body.dm
+15 -1
View File
@@ -254,6 +254,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(ind > 1)
out += ", "
out += "\tMechanical [organ_name]"
else if(status == "nymph")
++ind
if(ind > 1)
out += ", "
out += "\tDiona Nymph [organ_name]"
else if(status == "assisted")
++ind
if(ind > 1)
@@ -650,7 +655,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
to_chat(user, "<span class='notice'>Cancelled.</span>")
return TOPIC_NOACTION
var/list/available_states = list("Normal","Amputated","Prosthesis")
var/list/available_states = mob_species.possible_external_organs_modifications
if(carries_organs)
available_states = list("Normal","Prosthesis")
var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in available_states
@@ -664,6 +669,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(third_limb)
pref.organ_data -= third_limb
pref.rlimb_data -= third_limb
if("Amputated")
pref.organ_data[limb] = "amputated"
pref.rlimb_data[limb] = null
@@ -691,6 +697,14 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.organ_data[second_limb] = "cyborg"
if(third_limb && pref.organ_data[third_limb] == "amputated")
pref.organ_data[third_limb] = null
if("Diona Nymph")
pref.organ_data[limb] = "nymph"
pref.rlimb_data[limb] = null
if(second_limb)
pref.organ_data[second_limb] = "nymph"
pref.rlimb_data[second_limb] = null
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["organs"])
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+17
View File
@@ -456,3 +456,20 @@
var/obj/item/clothing/accessory/blood_patch/BP = type
patches[initial(BP.name)] = type
gear_tweaks += new /datum/gear_tweak/path(patches)
/datum/gear/accessory/bandanna
display_name = "neck bandanna selection"
path = /obj/item/clothing/accessory/bandanna
/datum/gear/accessory/bandanna/New()
..()
var/list/bandanna = list()
bandanna["red bandanna"] = /obj/item/clothing/accessory/bandanna
bandanna["blue bandanna"] = /obj/item/clothing/accessory/bandanna/blue
bandanna["black bandanna"] = /obj/item/clothing/accessory/bandanna/black
gear_tweaks += new /datum/gear_tweak/path(bandanna)
/datum/gear/accessory/bandanna_colorable
display_name = "neck bandanna (colorable)"
path = /obj/item/clothing/accessory/bandanna/colorable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
code/modules/client/preference_setup/loadout/loadout_augments.dm
+7 -7
View File
@@ -5,7 +5,7 @@
cost = 1
augment = TRUE
sort_category = "Augments"
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
flags = GEAR_NO_SELECTION
/datum/gear/augment/eye_sensors
@@ -100,27 +100,27 @@
display_name = "psionic receiver"
description = "An augment installed into the head that functions as a surrogate for a missing zona bovinae, also functioning as a filter for the psionically-challenged."
path = /obj/item/organ/internal/augment/psi
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
/datum/gear/augment/memory_inhibitor
display_name = "memory inhibitor"
description = "A Zeng Hu implant that allows one to have control over their memories, allowing you to set a timer and remove any memories developed within it."
path = /obj/item/organ/internal/augment/memory_inhibitor
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/augment/emotional_manipulator
display_name = "emotional manipulator"
description = "A Zeng Hu brain implant to manipulate the brain's chemicals to induce a calming or happy feeling."
path = /obj/item/organ/internal/augment/emotional_manipulator
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/augment/enhanced_vision
display_name = "vision enhanced retinas"
description = "Zeng Hu implants given to EMTs to assist with finding the injured. These eye implants allow one to see further than you normally could."
path = /obj/item/organ/internal/augment/enhanced_vision
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
cost = 3
@@ -128,7 +128,7 @@
display_name = "ocular installed sightlights"
description = "Designed to assist Zeng-Hu medical personnel in darker areas or places experiencing periodic power issues, Sightlights will allow one to be able to use their eyes as a flashlight."
path = /obj/item/organ/internal/augment/sightlights
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
cost = 3
@@ -136,7 +136,7 @@
display_name = "zeng-hu veterancy plate"
description = "A clear sign of Zeng-Hu's best, this plate bearing the company's symbol is installed on those who prove themselves in the hyper-competitive environment"
path = /obj/item/organ/internal/augment/zenghu_plate
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/augment/corrective_lenses
code/modules/client/preference_setup/loadout/loadout_ears.dm
-17
View File
@@ -9,23 +9,6 @@
path = /obj/item/clothing/ears/earmuffs
slot = null
/datum/gear/ears/bandanna
display_name = "neck bandanna selection"
path = /obj/item/clothing/ears/bandanna
/datum/gear/ears/bandanna/New()
..()
var/list/bandanna = list()
bandanna["red bandanna"] = /obj/item/clothing/ears/bandanna
bandanna["blue bandanna"] = /obj/item/clothing/ears/bandanna/blue
bandanna["black bandanna"] = /obj/item/clothing/ears/bandanna/black
gear_tweaks += new /datum/gear_tweak/path(bandanna)
/datum/gear/ears/bandanna_colorable
display_name = "neck bandanna (colorable)"
path = /obj/item/clothing/ears/bandanna/colorable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/ears/double/headphones
display_name = "headphones"
path = /obj/item/clothing/ears/earmuffs/headphones
code/modules/client/preference_setup/loadout/loadout_factions.dm
+23 -4
View File
@@ -20,12 +20,13 @@
display_name = "idris service skirt"
description = "Not for security usage."
path = /obj/item/clothing/under/rank/idris/service/alt
slot = slot_wear_suit
slot = slot_w_uniform
faction = "Idris Incorporated"
/datum/gear/faction/idris_armband
display_name = "idris armband"
path = /obj/item/clothing/accessory/armband/idris
slot = slot_tie
faction = "Idris Incorporated"
/datum/gear/faction/idris_windbreaker
@@ -37,11 +38,13 @@
/datum/gear/faction/idris_passcard
display_name = "idris silversun passcard"
path = /obj/item/clothing/accessory/badge/passcard/sol/silversun
slot = slot_tie
faction = "Idris Incorporated"
/datum/gear/faction/idris_rag
display_name = "idris advanced service cloth"
path = /obj/item/reagent_containers/glass/rag/advanced/idris
slot = slot_in_backpack
faction = "Idris Incorporated"
/datum/gear/faction/idris_sunglasses
@@ -60,6 +63,20 @@
idris_sunglasses["aviator sunglasses, Idris"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/idris
gear_tweaks += new /datum/gear_tweak/path(idris_sunglasses)
/datum/gear/faction/idris_labcoat
display_name = "idris labcoat selection"
description = "A selection of Idris labcoats."
path = /obj/item/clothing/suit/storage/toggle/labcoat/idris
slot = slot_wear_suit
faction = "Idris Incorporated"
/datum/gear/faction/idris_labcoat/New()
..()
var/list/idris_labcoats = list()
idris_labcoats["labcoat, Idris"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris
idris_labcoats["labcoat, Idris alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/alt
gear_tweaks += new /datum/gear_tweak/path(idris_labcoats)
/datum/gear/faction/zavodskoi_beret
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/security/zavodskoi
@@ -82,13 +99,13 @@
/datum/gear/faction/zavodskoi_uniform_alt
display_name = "brown zavodskoi uniform"
path = /obj/item/clothing/under/rank/security/zavodskoi/alt
slot = slot_wear_suit
slot = slot_w_uniform
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_research_alt
display_name = "brown zavodskoi research uniform"
path = /obj/item/clothing/under/rank/zavodskoi/research/alt
slot = slot_wear_suit
slot = slot_w_uniform
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_labcoat
@@ -159,7 +176,7 @@
/datum/gear/faction/zenghu_uniform_alt
display_name = "zeng-hu white uniform"
path = /obj/item/clothing/under/rank/zeng/alt
slot = slot_wear_suit
slot = slot_w_uniform
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_beret
@@ -222,6 +239,7 @@
display_name = "idris security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/idrissec
faction = "Idris Incorporated"
slot = slot_tie
allowed_roles = list("Security Officer","Investigator")
/datum/gear/faction/heph_labcoat
@@ -239,4 +257,5 @@
/datum/gear/faction/heph_passcard
display_name = "hephaestus burszia passcard"
path = /obj/item/clothing/accessory/badge/passcard/burszia
slot = slot_tie
faction = "Hephaestus Industries"
code/modules/client/preference_setup/loadout/loadout_head.dm
+44 -2
View File
@@ -4,6 +4,10 @@
slot = slot_head
sort_category = "Hats and Headwear"
/datum/gear/head/New()
..()
gear_tweaks += list(gear_tweak_hair_block)
/datum/gear/head/ushanka_grey
display_name = "ushanka, grey"
path = /obj/item/clothing/head/ushanka/grey
@@ -269,12 +273,20 @@
display_name = "non la hat"
path = /obj/item/clothing/head/nonla
/datum/gear/head/iacberet
display_name = "IAC Beret"
/datum/gear/head/iac
display_name = "IAC headgear selection"
description = "A selection of hats worn by Interstellar Aid Corps volunteers."
path = /obj/item/clothing/head/softcap/iac
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/iac/New()
..()
var/list/iac = list()
iac["IAC cap"] = /obj/item/clothing/head/softcap/iac
iac["IAC beret"] = /obj/item/clothing/head/beret/iac
gear_tweaks += new /datum/gear_tweak/path(iac)
/datum/gear/head/circuitry
display_name = "headwear, circuitry (empty)"
path = /obj/item/clothing/head/circuitry
@@ -336,3 +348,33 @@
display_name = "dominian consular cap"
path = /obj/item/clothing/head/dominia
allowed_roles = list("Consular Officer")
/datum/gear/head/hairnet
display_name = "hairnet"
path = /obj/item/clothing/head/surgery/hairnet
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/*
Block Hair Adjustment
*/
var/datum/gear_tweak/hair_block/gear_tweak_hair_block = new()
/datum/gear_tweak/hair_block/get_contents(var/metadata)
return "Blocks Hair: [metadata]"
/datum/gear_tweak/hair_block/get_default()
return "Default"
/datum/gear_tweak/hair_block/get_metadata(var/user, var/metadata)
return input(user, "Choose whether you want your headgear to block hair, or use the headgear's default.", "Hair Blocking", metadata) as anything in list("Yes", "No", "Default")
/datum/gear_tweak/hair_block/tweak_item(var/obj/item/clothing/head/H, var/metadata)
if(!istype(H))
return
if(!H.allow_hair_covering)
return
switch(metadata)
if("Yes")
H.flags_inv |= BLOCKHEADHAIR
if("No")
H.flags_inv &= ~BLOCKHEADHAIR
code/modules/client/preference_setup/loadout/loadout_utility.dm
+23 -8
View File
@@ -98,7 +98,7 @@
/datum/gear/utility/wheelchair/color
display_name = "wheelchair"
path = /obj/item/wheelchair
path = /obj/item/material/stool/chair/wheelchair
cost = 4
/datum/gear/utility/wheelchair/color/New()
@@ -107,27 +107,42 @@
/datum/gear/utility/business_card_holder
display_name = "business card holder"
description = "Comes in different materials."
path = /obj/item/storage/business_card_holder
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
/datum/gear/utility/business_card_holder/New()
..()
var/list/holders = list()
holders["business card holder, metal"] = /obj/item/storage/business_card_holder
holders["business card holder, wood"] = /obj/item/storage/business_card_holder/wood
holders["business card holder, leather"] = /obj/item/storage/business_card_holder/leather
holders["business card holder, plastic"] = /obj/item/storage/business_card_holder/plastic
gear_tweaks += new /datum/gear_tweak/path(holders)
/datum/gear/utility/business_card
display_name = "business card"
description = "A selection of business cards." // I'm not smart enough to make it spawn inside the holders and carry over the text so we'll have to live with this
path = /obj/item/paper/business_card
flags = 0
flags = GEAR_HAS_COLOR_SELECTION
/datum/gear/utility/business_card/New()
..()
var/list/cards = list()
cards["business card, divided"] = /obj/item/paper/business_card
cards["business card, plain"] = /obj/item/paper/business_card/alt
cards["business card, rounded"] = /obj/item/paper/business_card/rounded
cards["business card, glass"] = /obj/item/paper/business_card/glass
cards["paper business card, divided"] = /obj/item/paper/business_card
cards["paper business card, plain"] = /obj/item/paper/business_card/alt
cards["paper business card, rounded"] = /obj/item/paper/business_card/rounded
cards["glass business card"] = /obj/item/paper/business_card/glass
cards["glass business card, black flair"] = /obj/item/paper/business_card/glass/b
cards["glass business card, grey flair"] = /obj/item/paper/business_card/glass/g
cards["glass business card, silver flair"] = /obj/item/paper/business_card/glass/s
cards["glass business card, white flair"] = /obj/item/paper/business_card/glass/w
gear_tweaks += new /datum/gear_tweak/path(cards)
gear_tweaks += new /datum/gear_tweak/paper_data()
/datum/gear/utility/pills
display_name = "pill bottle selection"
description = "A selection of prescription pill. NOTICE: most of these are considered contraband if possessed without the relevant prescription noted in the medical records."
description = "A selection of prescription pills. NOTICE: most of these are considered contraband if possessed without the relevant prescription noted in the medical records."
path = /obj/item/reagent_containers/pill
/datum/gear/utility/pills/New()
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+3 -3
View File
@@ -9,14 +9,14 @@
display_name = "cloth footwraps"
path = /obj/item/clothing/shoes/footwraps
sort_category = "Xenowear"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/shoes/toeless
display_name = "toe-less jackboots"
path = /obj/item/clothing/shoes/jackboots/toeless
sort_category = "Xenowear"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
/datum/gear/shoes/caligae
display_name = "caligae selection"
@@ -37,7 +37,7 @@
/datum/gear/shoes/toeless
display_name = "toeless boot selection"
path = /obj/item/clothing/shoes/jackboots/toeless
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
sort_category = "Xenowear"
/datum/gear/shoes/toeless/New()
code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm
+11 -5
View File
@@ -57,7 +57,7 @@
/datum/gear/accessory/capes
display_name = "shoulder capes"
path = /obj/item/clothing/accessory/poncho/shouldercape
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Skrell"
/datum/gear/accessory/capes/New()
@@ -69,6 +69,12 @@
capes["galaxy cape"] = /obj/item/clothing/accessory/poncho/shouldercape/galaxy
gear_tweaks += new /datum/gear_tweak/path(capes)
/datum/gear/accessory/qeblak
display_name = "qeblak mantle"
path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Skrell"
/datum/gear/uniform/skrell
display_name = "qeblak ceremonial garment"
path = /obj/item/clothing/under/skrell/qeblak
@@ -85,7 +91,7 @@
/datum/gear/skrell_projector
display_name = "nralakk projector"
path = /obj/item/skrell_projector
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Skrell"
/datum/gear/ears/skrell/goop
@@ -120,7 +126,7 @@
display_name = "jargon federation passport"
path = /obj/item/clothing/accessory/badge/passport/jargon
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS)
flags = GEAR_NO_SELECTION
cost = 0
@@ -138,14 +144,14 @@
// the whitelisted list ensures only people with skrell, vaurca, or diona whitelists can reach this check
/datum/gear/accessory/skrell_passport/check_species_whitelist(mob/living/carbon/human/H)
var/static/list/species_list = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_DIONA)
var/static/list/species_list = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS)
if(H.species.name in species_list)
return TRUE
return FALSE
/datum/gear/accessory/skrell_passport/spawn_item(location, metadata, mob/living/carbon/human/H)
var/obj/item/clothing/accessory/badge/passport/jargon/J = ..()
var/static/list/species_name_to_tag = list(SPECIES_SKRELL = "_s", SPECIES_SKRELL_AXIORI = "_s", SPECIES_VAURCA_WARRIOR = "_v", SPECIES_VAURCA_WORKER = "_v", SPECIES_VAURCA_BREEDER = "_v", SPECIES_DIONA = "_d")
var/static/list/species_name_to_tag = list(SPECIES_SKRELL = "_s", SPECIES_SKRELL_AXIORI = "_s", SPECIES_VAURCA_WARRIOR = "_v", SPECIES_VAURCA_WORKER = "_v", SPECIES_VAURCA_BREEDER = "_v", SPECIES_VAURCA_BULWARK = "_v", SPECIES_DIONA = "_d", SPECIES_DIONA_COEUS = "_d")
var/tag = species_name_to_tag[H.species.name]
if(tag)
J.species_tag = tag
code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm
+16 -7
View File
@@ -18,7 +18,7 @@
display_name = "filter port"
path = /obj/item/clothing/mask/breath/vaurca/filter
cost = 1
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
/datum/gear/mask/vaurca_expression
@@ -36,7 +36,7 @@
/datum/gear/head/shaper
display_name = "shaper helmet"
path = /obj/item/clothing/head/shaper
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -44,7 +44,7 @@
display_name = "tunnel cloak (recolourable)"
path = /obj/item/storage/backpack/cloak
cost = 1
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -52,7 +52,7 @@
display_name = "tunnel cloak selection"
path = /obj/item/storage/backpack/cloak
cost = 1
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_DESC_SELECTION
@@ -96,7 +96,7 @@
display_name = "shaper robes"
path = /obj/item/clothing/suit/vaurca/shaper
slot = slot_wear_suit
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
cost = 1
flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -140,7 +140,7 @@
path = /obj/item/organ/internal/augment/language/klax
cost = 2
sort_category = "Xenowear - Vaurca"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK)
flags = GEAR_NO_SELECTION
/datum/gear/augment/language_processor/New()
@@ -156,7 +156,7 @@
cost = 2
path = /obj/item/storage/toolbox/lunchbox
sort_category = "Xenowear - Vaurca"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK)
/datum/gear/vaurca_lunchbox/New()
..()
@@ -168,3 +168,12 @@
sortTim(lunchboxes, /proc/cmp_text_asc)
gear_tweaks += new /datum/gear_tweak/path(lunchboxes)
gear_tweaks += new /datum/gear_tweak/contents(lunchables_vaurca(), lunchables_vaurca_snack(), lunchables_drinks(), lunchables_utensil())
/datum/gear/ears/vaurca/rings
display_name = "bulwark horn rings"
description = "Rings worn by Bulwarks to decorate their horns."
cost = 1
path = /obj/item/clothing/ears/bulwark/rings
sort_category = "Xenowear - Vaurca"
whitelisted = list(SPECIES_VAURCA_BULWARK)
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION