diff --git a/aurorastation.dme b/aurorastation.dme index c0593e3293c..0d714f24c33 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1654,6 +1654,7 @@ #include "code\modules\clothing\suits\storage.dm" #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\wiz_robe.dm" +#include "code\modules\clothing\suits\xeno\diona.dm" #include "code\modules\clothing\suits\xeno\tajara.dm" #include "code\modules\clothing\suits\xeno\unathi.dm" #include "code\modules\clothing\suits\xeno\vaurca.dm" @@ -1672,6 +1673,7 @@ #include "code\modules\clothing\under\accessories\medal.dm" #include "code\modules\clothing\under\accessories\shirts.dm" #include "code\modules\clothing\under\accessories\storage.dm" +#include "code\modules\clothing\under\accessories\xeno\diona.dm" #include "code\modules\clothing\under\accessories\xeno\skrell.dm" #include "code\modules\clothing\under\accessories\xeno\tajara.dm" #include "code\modules\clothing\under\accessories\xeno\unathi.dm" @@ -1681,6 +1683,7 @@ #include "code\modules\clothing\under\jobs\medsci.dm" #include "code\modules\clothing\under\jobs\security.dm" #include "code\modules\clothing\under\jobs\sol.dm" +#include "code\modules\clothing\under\xenos\diona.dm" #include "code\modules\clothing\under\xenos\skrell.dm" #include "code\modules\clothing\under\xenos\tajara.dm" #include "code\modules\clothing\under\xenos\unathi.dm" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm new file mode 100644 index 00000000000..34b658187ef --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm @@ -0,0 +1,302 @@ +/datum/gear/accessory/dionae_sol_passcard + display_name = "dionae sol passcard" + description = "A passport issued to Dionae citizens of the Sol Alliance who have completed their assigned contract." + path = /obj/item/clothing/accessory/badge/passcard/sol_diona + cost = 0 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_NO_SELECTION + culture_restriction = list(/decl/origin_item/culture/diona_sol) + +/datum/gear/suit/diona/eternal + display_name = "mesh weave robes" + description = "A set of mesh weave robes worn almost exclusively by priests of the Orthodox Eternal faith." + path = /obj/item/clothing/suit/diona/eternal + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_NO_SELECTION + +/datum/gear/suit/diona/eternal/iron + display_name = "grey mesh weave robes" + description = "A set of mesh weave robes worn almost exclusively by priests of the Iron Eternal faith." + path = /obj/item/clothing/suit/diona/eternal/iron + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_NO_SELECTION + +/datum/gear/uniform/diona/narrows + display_name = "antiquated hephaestus prison uniform" + description = "An old prison uniform, tattered with age. A Hephaestus logo has been haphazardly stitched to the shoulder, and a band of green circles around the middle." + path = /obj/item/clothing/under/diona/narrows + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/narrows) + +//skrell shared things + +/datum/gear/accessory/capes/diona + display_name = "shoulder capes" + path = /obj/item/clothing/accessory/poncho/shouldercape + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/accessory/capes/diona/New() + ..() + var/list/capes = list() + capes["star cape"] = /obj/item/clothing/accessory/poncho/shouldercape/star + capes["nebula cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nebula + capes["nova cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nova + capes["galaxy cape"] = /obj/item/clothing/accessory/poncho/shouldercape/galaxy + gear_tweaks += new /datum/gear_tweak/path(capes) + +/datum/gear/accessory/qeblak/diona + display_name = "qeblak mantle" + path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/accessory/weishii/diona + display_name = "weishii robe" + path = /obj/item/clothing/accessory/poncho/shouldercape/weishiirobe + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/skrell_projector/diona + display_name = "nralakk projector" + path = /obj/item/skrell_projector + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/homeworld_deck/diona + display_name = "qweipaqui homeworld deck" + path = /obj/item/deck/tarot/jargon + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_NO_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/colonist_deck/diona // Intentionally separate from homeworld_deck, so that both can be chosen. -Lly + display_name = "qweipaqui colonist deck" + path = /obj/item/deck/tarot/nonjargon + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/accessory/skrell_passport/diona + display_name = "jargon federation passport" + path = /obj/item/clothing/accessory/badge/passport/jargon + sort_category = "Xenowear - Skrell" + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + cost = 0 + flags = GEAR_NO_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/accessory/diona/skrell_passport/check_species_whitelist(mob/living/carbon/human/H) + var/static/list/species_list = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + if(H.species.name in species_list) + return TRUE + return FALSE + +/datum/gear/accessory/diona/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_DIONA = "_d", SPECIES_DIONA_COEUS = "_d") + var/tag = species_name_to_tag[H.species.name] + if(tag) + J.species_tag = tag + return J + +/datum/gear/uniform/work/diona + display_name = "work uniforms" + path = /obj/item/clothing/under/skrell/jargon + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + flags = GEAR_HAS_DESC_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/uniform/work/diona/New() + ..() + var/list/outfit = list() + outfit["ox research"] = /obj/item/clothing/under/skrell/jargon + outfit["ox security"] = /obj/item/clothing/under/skrell/jargon/ox + outfit["ox engineer"] = /obj/item/clothing/under/skrell/jargon/ox/engineer + outfit["ox service"] = /obj/item/clothing/under/skrell/jargon/ox/service + outfit["ox medical"] = /obj/item/clothing/under/skrell/jargon/ox/med + outfit["ix research"] = /obj/item/clothing/under/skrell/jargon/ix + outfit["ix security"] = /obj/item/clothing/under/skrell/jargon/ix/security + outfit["ix engineer"] = /obj/item/clothing/under/skrell/jargon/ix/engineer + outfit["ix service"] = /obj/item/clothing/under/skrell/jargon/ix/service + outfit["ix medical"] = /obj/item/clothing/under/skrell/jargon/ix/med + outfit["oqi research"] = /obj/item/clothing/under/skrell/jargon/oqi + outfit["oqi security"] = /obj/item/clothing/under/skrell/jargon/oqi/security + outfit["oqi engineer"] = /obj/item/clothing/under/skrell/jargon/oqi/engineer + outfit["oqi service"] = /obj/item/clothing/under/skrell/jargon/oqi/service + outfit["oqi medical"] = /obj/item/clothing/under/skrell/jargon/oqi/med + outfit["iqi research"] = /obj/item/clothing/under/skrell/jargon/iqi + outfit["iqi security"] = /obj/item/clothing/under/skrell/jargon/iqi/security + outfit["iqi engineer"] = /obj/item/clothing/under/skrell/jargon/iqi/engineer + outfit["iqi service"] = /obj/item/clothing/under/skrell/jargon/iqi/service + outfit["iqi medical"] = /obj/item/clothing/under/skrell/jargon/iqi/med + gear_tweaks += new /datum/gear_tweak/path(outfit) + +/datum/gear/suit/jacketdiona/ + display_name = "work jackets" + path = /obj/item/clothing/suit/storage/toggle/skrell + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_DESC_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/suit/jacket/diona/New() + ..() + var/list/jacket = list() + jacket["ox research"] = /obj/item/clothing/suit/storage/toggle/skrell + jacket["ox bridge/security"] = /obj/item/clothing/suit/storage/toggle/skrell/ox/security + jacket["ox engineer"] = /obj/item/clothing/suit/storage/toggle/skrell/ox/engineer + jacket["ox cargo/service"] = /obj/item/clothing/suit/storage/toggle/skrell/ox/service + jacket["ox medical"] = /obj/item/clothing/suit/storage/toggle/skrell/ox/med + jacket["ix research"] = /obj/item/clothing/suit/storage/toggle/skrell/ix + jacket["ix bridge/security"] = /obj/item/clothing/suit/storage/toggle/skrell/ix/security + jacket["ix engineer"] = /obj/item/clothing/suit/storage/toggle/skrell/ix/engineer + jacket["ix cargo/service"] = /obj/item/clothing/suit/storage/toggle/skrell/ix/service + jacket["ix medical"] = /obj/item/clothing/suit/storage/toggle/skrell/ix/med + jacket["oqi research"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi + jacket["oqi bridge/security"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi/security + jacket["oqi engineer"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi/engineer + jacket["oqi cargo/service"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi/service + jacket["oqi medical"] = /obj/item/clothing/suit/storage/toggle/skrell/oqi/med + jacket["iqi research"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi + jacket["iqi bridge/security"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi/security + jacket["iqi engineer"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi/engineer + jacket["iqi cargo/service"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi/service + jacket["iqi medical"] = /obj/item/clothing/suit/storage/toggle/skrell/iqi/med + gear_tweaks += new /datum/gear_tweak/path(jacket) + +/datum/gear/accessory/diona/poncho + display_name = "skrell poncho" + path = /obj/item/clothing/accessory/poncho/skrell + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_DESC_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/accessory/diona/poncho/New() + ..() + var/list/poncho = list() + poncho["brown"] = /obj/item/clothing/accessory/poncho/skrell/brown + poncho["tan"] = /obj/item/clothing/accessory/poncho/skrell/tan + poncho["gray"] = /obj/item/clothing/accessory/poncho/skrell/gray + poncho["white"] = /obj/item/clothing/accessory/poncho/skrell + gear_tweaks += new /datum/gear_tweak/path(poncho) + +/datum/gear/accessory/diona/workcloak + display_name = "work cloaks" + path = /obj/item/clothing/accessory/poncho/shouldercape + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_DESC_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim) + +/datum/gear/accessory/diona/workcloak/New() + ..() + var/list/workcloak = list() + workcloak["ox cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak + workcloak["ix cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/ix + workcloak["oqi cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/oqi + workcloak["iqi cloak"] = /obj/item/clothing/accessory/poncho/shouldercape/cloak/iqi + gear_tweaks += new /datum/gear_tweak/path(workcloak) + +//unathi shared things + +/datum/gear/accessory/sinta_hood/diona + display_name = "clan hood" + slot = slot_head + path = /obj/item/clothing/accessory/sinta_hood + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_moghes) + +/datum/gear/suit/sash/diona + display_name = "gyazo belt" + path = /obj/item/clothing/accessory/unathi + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_moghes) + +/datum/gear/suit/unathi_mantle/diona + display_name = "peasant hide mantle selection" + description = "A selection of hide mantles, one for each of the desert, and mountainous \ + regions of Moghes. The forest mantle is exclusively for nobility these days." + path = /obj/item/clothing/accessory/poncho/unathimantle + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_COLOR_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_moghes) + +/datum/gear/suit/unathi_mantle/diona/New() + ..() + var/list/mantles = list() + mantles["hide mantle, desert"] = /obj/item/clothing/accessory/poncho/unathimantle + mantles["hide mantle, mountain"] = /obj/item/clothing/accessory/poncho/unathimantle/mountain + gear_tweaks += new /datum/gear_tweak/path(mantles) + +/datum/gear/suit/unathi_robe/diona + display_name = "roughspun robe" + path = /obj/item/clothing/suit/unathi/robe + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_moghes) + +/datum/gear/suit/unathi_robe/kilt + display_name = "wasteland kilt" + path = /obj/item/clothing/suit/unathi/robe/kilt + origin_restriction = list(/decl/origin_item/origin/dionae_wasteland) + +/datum/gear/uniform/unathi/diona + display_name = "sinta tunic" + path = /obj/item/clothing/under/unathi + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + culture_restriction = list(/decl/origin_item/culture/dionae_moghes) + +/datum/gear/head/sinta_ronin/diona + display_name = "straw hat" + path = /obj/item/clothing/head/unathi + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/dionae_moghes) + +/datum/gear/suit/robe_coat/diona + display_name = "tzirzi robe" + path = /obj/item/clothing/suit/unathi/robe/robe_coat + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/dionae_moghes) + +/datum/gear/eyes/wasteland_goggles/diona + display_name = "wasteland goggles" + path = /obj/item/clothing/glasses/safety/goggles/wasteland + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + origin_restriction = list(/decl/origin_item/origin/dionae_wasteland) + sort_category = "Xenowear - Diona" + +/datum/gear/uniform/unathi/zozo + display_name = "zozo top" + path = /obj/item/clothing/under/unathi/zozo + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + culture_restriction = list(/decl/origin_item/culture/dionae_moghes) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index b50bae55465..934a4c889f2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -56,7 +56,7 @@ /datum/gear/accessory/capes display_name = "shoulder capes" path = /obj/item/clothing/accessory/poncho/shouldercape - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Skrell" /datum/gear/accessory/capes/New() @@ -72,13 +72,13 @@ /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) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Skrell" /datum/gear/accessory/weishii display_name = "weishii robe" path = /obj/item/clothing/accessory/poncho/shouldercape/weishiirobe - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Skrell" /datum/gear/uniform/skrell @@ -111,7 +111,7 @@ /datum/gear/skrell_projector display_name = "nralakk projector" path = /obj/item/skrell_projector - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" /datum/gear/homeworld_deck @@ -182,7 +182,7 @@ display_name = "nralakk federation passport" path = /obj/item/clothing/accessory/badge/passport/nralakk sort_category = "Xenowear - Skrell" - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) flags = GEAR_NO_SELECTION cost = 0 @@ -276,7 +276,7 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/ /datum/gear/suit/skrell/jacket display_name = "work jackets" path = /obj/item/clothing/suit/storage/toggle/skrell - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -315,7 +315,7 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/ /datum/gear/accessory/skrell/poncho display_name = "skrell poncho" path = /obj/item/clothing/accessory/poncho/skrell - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -331,7 +331,7 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/ /datum/gear/accessory/skrell/workcloak display_name = "work cloaks" path = /obj/item/clothing/accessory/poncho/shouldercape - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/clothing/suits/xeno/diona.dm b/code/modules/clothing/suits/xeno/diona.dm new file mode 100644 index 00000000000..d8c5fed7837 --- /dev/null +++ b/code/modules/clothing/suits/xeno/diona.dm @@ -0,0 +1,22 @@ +/obj/item/clothing/suit/diona + name = "abstract suit" + icon = 'icons/obj/diona_items.dmi' + contained_sprite = TRUE + +/obj/item/clothing/suit/diona/eternal + name = "mesh weave robes" + desc = "A set of mesh weave robes worn almost exclusively by priests of the Orthodox Eternal faith." + icon_state = "orthodox_robe" + item_state = "orthodox_robe" + +/obj/item/clothing/suit/diona/eternal/iron + name = "grey mesh weave robes" + desc = "A set of mesh weave robes worn almost exclusively by priests of the Iron Eternal faith" + icon_state = "iron_robe" + item_state = "iron_robe" + +/obj/item/clothing/suit/diona/eternal/blood + name = "red mesh weave robes" + desc = "A set of mesh weave robes worn almost exclusively by priests of the Blood Eternal faith." + icon_state = "blood_robe" + item_state = "blood_robe" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/xeno/diona.dm b/code/modules/clothing/under/accessories/xeno/diona.dm new file mode 100644 index 00000000000..29ee2f30014 --- /dev/null +++ b/code/modules/clothing/under/accessories/xeno/diona.dm @@ -0,0 +1,17 @@ +/obj/item/clothing/accessory/badge/passcard/sol_diona + name = "Dionae Passcard" + desc = "A passcard issued to Dionae citizens of the Alliance of Sovereign Solarian Nations who have cleared their assigned contract. " + desc_fluff = "A passcard is a modern evolution of the state-issued identification card, with all the functionality of a driver's license, birth certificate, passport, or other document, \ + updated as necessary or able by a central government. The concept was pioneered in the early days of the Sol Alliance, and continues in most human stellar nations to this day, owing to the availability \ + and price of consumer plastics and self-powered microholograms." + icon_state = "passcard_sol_dionae" + item_state = "passcard_sol_dionae" + contained_sprite = TRUE + slot_flags = null + w_class = ITEMSIZE_TINY + flippable = FALSE + v_flippable = FALSE + badge_string = null + + drop_sound = 'sound/items/drop/card.ogg' + pickup_sound = 'sound/items/pickup/card.ogg' diff --git a/code/modules/clothing/under/xenos/diona.dm b/code/modules/clothing/under/xenos/diona.dm new file mode 100644 index 00000000000..f292f97cdd7 --- /dev/null +++ b/code/modules/clothing/under/xenos/diona.dm @@ -0,0 +1,10 @@ +/obj/item/clothing/under/diona + name = "abstract suit" + icon = 'icons/obj/diona_items.dmi' + contained_sprite = TRUE + +/obj/item/clothing/under/diona/narrows + name = "antiquated hephaestus prison uniform" + desc = "An old prison uniform, tattered with age. A Hephaestus logo has been haphazardly stitched to the shoulder, and a band of green circles around the middle." + icon_state = "narrows" + item_state = "narrows" \ No newline at end of file diff --git a/html/changelogs/Yonnimer-dionaloadout.yml b/html/changelogs/Yonnimer-dionaloadout.yml new file mode 100644 index 00000000000..fede65d68aa --- /dev/null +++ b/html/changelogs/Yonnimer-dionaloadout.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Yonnimer + +# 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: + - rscadd: "Added a Dionae loadout selection, along with four dionae-specific items to it" + - tweak: "Adds select Skrell and Unathi items to the Dionae loadout" diff --git a/icons/clothing/accessories/passcards.dmi b/icons/clothing/accessories/passcards.dmi index 8a4f4b34cf5..6a0b28a429e 100644 Binary files a/icons/clothing/accessories/passcards.dmi and b/icons/clothing/accessories/passcards.dmi differ diff --git a/icons/obj/diona_items.dmi b/icons/obj/diona_items.dmi new file mode 100644 index 00000000000..bc9a42d6f55 Binary files /dev/null and b/icons/obj/diona_items.dmi differ