cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Singletons + refactor of /datum/observ (#15487)" (#15515)

Browse Source
This commit is contained in:
Matt Atlas
2023-01-05 19:21:22 +01:00
committed by GitHub
parent 34b1bcd055
commit b1869884c1
506 changed files with 7214 additions and 7561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -427,10 +427,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/new_culture = mob_species.possible_cultures[1]
pref.culture = "[new_culture]"
var/singleton/origin_item/culture/OC = GET_SINGLETON(text2path(pref.culture))
var/decl/origin_item/culture/OC = decls_repository.get_decl(text2path(pref.culture))
var/new_origin = OC.possible_origins[1]
pref.origin = "[new_origin]"
var/singleton/origin_item/origin/OO = GET_SINGLETON(text2path(pref.origin))
var/decl/origin_item/origin/OO = decls_repository.get_decl(text2path(pref.origin))
pref.accent = OO.possible_accents[1]
pref.citizenship = OO.possible_citizenships[1]
pref.religion = OO.possible_religions[1]

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

@@ -247,7 +247,7 @@ var/list/gear_datums = list()
temp_html += "</font><font size = 1>(Culture: "
var/culture_count = 0
for(var/culture in G.culture_restriction)
var/singleton/origin_item/C = GET_SINGLETON(culture)
var/decl/origin_item/C = decls_repository.get_decl(culture)
temp_html += "[C.name]"
culture_count++
if(culture_count == G.culture_restriction.len)
@@ -259,7 +259,7 @@ var/list/gear_datums = list()
temp_html += "</font><font size = 1>(Origin: "
var/origin_count = 0
for(var/origin in G.origin_restriction)
var/singleton/origin_item/O = GET_SINGLETON(origin)
var/decl/origin_item/O = decls_repository.get_decl(origin)
temp_html += "[O.name]"
origin_count++
if(origin_count == G.origin_restriction.len)

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

@@ -362,7 +362,7 @@
description = "A selection of cadre brassards from Gadpathur."
path = /obj/item/clothing/accessory/armband/gadpathur
flags = GEAR_HAS_DESC_SELECTION
origin_restriction = list(/singleton/origin_item/origin/gadpathur)
origin_restriction = list(/decl/origin_item/origin/gadpathur)
/datum/gear/accessory/gadpathur/New()
..()
@@ -377,14 +377,14 @@
description = "A small metal badge worn by Gadpathurian Section Leaders."
path = /obj/item/clothing/accessory/gadpathurian_leader
flags = GEAR_HAS_DESC_SELECTION
origin_restriction = list(/singleton/origin_item/origin/gadpathur)
origin_restriction = list(/decl/origin_item/origin/gadpathur)
/datum/gear/accessory/gadpathur_dogtags
display_name = "gadpathurian dogtags"
description = "Dogtags issued to Gadpathurians."
path = /obj/item/clothing/accessory/dogtags/gadpathur
flags = GEAR_HAS_DESC_SELECTION
origin_restriction = list(/singleton/origin_item/origin/gadpathur)
origin_restriction = list(/decl/origin_item/origin/gadpathur)
/datum/gear/accessory/sash_coloured
display_name = "sash (colourable)"

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

@@ -372,7 +372,7 @@
/datum/gear/gadbook
display_name = "gadpathurian morale manual"
path = /obj/item/device/versebook/gadpathur
origin_restriction = list(/singleton/origin_item/origin/gadpathur)
origin_restriction = list(/decl/origin_item/origin/gadpathur)
/datum/gear/aurora_miniature
display_name = "aurora miniature"

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

@@ -354,7 +354,7 @@
display_name = "himean cap"
path = /obj/item/clothing/head/softcap/himeo
flags = GEAR_HAS_DESC_SELECTION
origin_restriction = list(/singleton/origin_item/origin/himeo, /singleton/origin_item/origin/ipc_himeo, /singleton/origin_item/origin/free_council)
origin_restriction = list(/decl/origin_item/origin/himeo, /decl/origin_item/origin/ipc_himeo, /decl/origin_item/origin/free_council)
/datum/gear/head/vysoka
display_name = "vysokan fur cap"
@@ -376,7 +376,7 @@
description = "A selection of headgear from Gadpathur."
path = /obj/item/clothing/head/gadpathur
flags = GEAR_HAS_DESC_SELECTION
origin_restriction = list(/singleton/origin_item/origin/gadpathur)
origin_restriction = list(/decl/origin_item/origin/gadpathur)
/datum/gear/head/gadpathur/New()
..()

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

@@ -72,7 +72,7 @@
description = "A selection of robes belonging to Dominia's Moroz Holy Tribunal."
path = /obj/item/clothing/under/dominia/priest
slot = slot_w_uniform
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/religion/dominia/robe/New()
..()
@@ -86,7 +86,7 @@
description = "A selection of modified berets belonging to Dominia's Moroz Holy Tribunal."
path = /obj/item/clothing/under/dominia/priest
slot= slot_head
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/religion/dominia/beret/New()
..()
@@ -101,7 +101,7 @@
description = "A selection of capes and outerwear worn by the Moroz Holy Tribunal."
path = /obj/item/clothing/under/dominia/priest
slot = slot_wear_suit
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/religion/dominia/cape/New()
..()
@@ -116,7 +116,7 @@
description = "A selection of robes worn by adherents to Luceism."
path = /obj/item/clothing/accessory/poncho/assunzione
slot = slot_wear_suit
origin_restriction = list(/singleton/origin_item/origin/assunzione, /singleton/origin_item/origin/ipc_assunzione)
origin_restriction = list(/decl/origin_item/origin/assunzione, /decl/origin_item/origin/ipc_assunzione)
/datum/gear/religion/assunzione/robe/New()
..()
@@ -130,14 +130,14 @@
display_name = "tribunal necklace"
path = /obj/item/clothing/accessory/dominia
slot = slot_tie
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/religion/dominia/medical
display_name = "tribunalist medical beret"
path = /obj/item/clothing/head/beret/dominia/medical
slot = slot_head
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/religion/shaman_staff
display_name = "shaman staff"
@@ -150,7 +150,7 @@
path = /obj/item/clothing/under/dominia/priest/consular
slot = slot_w_uniform
allowed_roles = list("Consular Officer")
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/religion/dominia/beret_consular
display_name = "tribunalist consular beret"
@@ -158,7 +158,7 @@
path = /obj/item/clothing/head/beret/dominia/consular
slot = slot_head
allowed_roles = list("Consular Officer")
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/religion/dominia/cape_consular
display_name = "tribunalist cousular cape"
@@ -166,27 +166,27 @@
path = /obj/item/clothing/accessory/poncho/dominia/consular
slot = slot_wear_suit
allowed_roles = list("Consular Officer")
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/religion/assunzione/accessory
display_name = "luceian amulet"
path = /obj/item/clothing/accessory/assunzione
slot = slot_tie
origin_restriction = list(/singleton/origin_item/origin/assunzione, /singleton/origin_item/origin/ipc_assunzione)
origin_restriction = list(/decl/origin_item/origin/assunzione, /decl/origin_item/origin/ipc_assunzione)
/datum/gear/religion/assunzioneorb
display_name = "assunzione warding sphere"
description = "A religious artefact commonly associated with Luceism."
path = /obj/item/assunzioneorb
origin_restriction = list(/singleton/origin_item/origin/assunzione, /singleton/origin_item/origin/ipc_assunzione)
origin_restriction = list(/decl/origin_item/origin/assunzione, /decl/origin_item/origin/ipc_assunzione)
/datum/gear/religion/assunzionesheath
display_name = "assunzione warding sphere sheath"
description = "A small metal shell designed to hold a warding sphere."
path = /obj/item/storage/assunzionesheath
origin_restriction = list(/singleton/origin_item/origin/assunzione, /singleton/origin_item/origin/ipc_assunzione)
origin_restriction = list(/decl/origin_item/origin/assunzione, /decl/origin_item/origin/ipc_assunzione)
/datum/gear/religion/dominia/codex
display_name = "tribunal codex"
path = /obj/item/device/versebook/tribunal
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)

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

@@ -244,7 +244,7 @@ datum/gear/suit/colorvest
display_name = "dominian cape"
path = /obj/item/clothing/accessory/poncho/dominia_cape
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/suit/dominia_cape/New()
..()
@@ -268,7 +268,7 @@ datum/gear/suit/colorvest
description = "A selection of Dominian coats and jackets."
path = /obj/item/clothing/suit/storage/toggle/dominia
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/suit/dominia/New()
..()
@@ -289,7 +289,7 @@ datum/gear/suit/colorvest
description = "A selection of Fisanduhian jackets."
path = /obj/item/clothing/suit/storage/toggle/dominia/bomber
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi)
/datum/gear/suit/fisanduhian_bomber/New()
..()
@@ -380,7 +380,7 @@ datum/gear/suit/colorvest
display_name = "himean coat selection"
path = /obj/item/clothing/suit/storage/toggle/himeo
flags = GEAR_HAS_DESC_SELECTION
origin_restriction = list(/singleton/origin_item/origin/himeo, /singleton/origin_item/origin/ipc_himeo, /singleton/origin_item/origin/free_council)
origin_restriction = list(/decl/origin_item/origin/himeo, /decl/origin_item/origin/ipc_himeo, /decl/origin_item/origin/free_council)
/datum/gear/suit/himeo/New()
..()
@@ -394,7 +394,7 @@ datum/gear/suit/colorvest
description = "A selection of Vysokan chokhas."
path = /obj/item/clothing/suit/storage/vysoka
flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka)
origin_restriction = list(/decl/origin_item/origin/vysoka, /decl/origin_item/origin/ipc_vysoka)
/datum/gear/suit/vysoka/New()
..()
@@ -429,7 +429,7 @@ datum/gear/suit/colorvest
display_name = "gadpathurian coat selection"
path = /obj/item/clothing/suit/storage/gadpathur
flags = GEAR_HAS_DESC_SELECTION
origin_restriction = list(/singleton/origin_item/origin/gadpathur)
origin_restriction = list(/decl/origin_item/origin/gadpathur)
/datum/gear/suit/gadpathur/New()
..()

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

@@ -235,7 +235,7 @@
description = "A selection of Dominian suits."
path = /obj/item/clothing/under/dominia
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi)
/datum/gear/uniform/dominia/New()
..()
@@ -255,7 +255,7 @@
display_name = "dominian dress selection"
description = "A selection of Dominian dresses."
path = /obj/item/clothing/under/dominia/dress
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi)
/datum/gear/uniform/dominia_dress/New()
..()
@@ -274,7 +274,7 @@
description = "A selection of Dominian clothing belonging to the Diplomatic Service."
path = /obj/item/clothing/under/dominia/consular
allowed_roles = list("Consular Officer")
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi, /singleton/origin_item/culture/diona_dominia)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia)
/datum/gear/uniform/dominia_consular/New()
..()
@@ -287,7 +287,7 @@
display_name = "fisanduhian sweater"
path = /obj/item/clothing/under/dominia/sweater
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi)
culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi)
/datum/gear/uniform/elyra_holo
display_name = "elyran holographic suit selection"
@@ -379,7 +379,7 @@
display_name = "gadpathurian fatigues"
path = /obj/item/clothing/under/uniform/gadpathur
flags = GEAR_HAS_DESC_SELECTION
origin_restriction = list(/singleton/origin_item/origin/gadpathur)
origin_restriction = list(/decl/origin_item/origin/gadpathur)
/datum/gear/uniform/miscellaneous/qipao
display_name = "qipao"

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

@@ -95,7 +95,7 @@
display_name = "himean voidsuit kit"
path = /obj/item/voidsuit_modkit/himeo
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
origin_restriction = list(/singleton/origin_item/origin/himeo, /singleton/origin_item/origin/ipc_himeo, /singleton/origin_item/origin/free_council)
origin_restriction = list(/decl/origin_item/origin/himeo, /decl/origin_item/origin/ipc_himeo, /decl/origin_item/origin/free_council)
/datum/gear/utility/wheelchair/color
display_name = "wheelchair"

46
code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm
View File

@@ -6,7 +6,7 @@
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
flags = GEAR_NO_SELECTION
culture_restriction = list(/singleton/origin_item/culture/diona_sol)
culture_restriction = list(/decl/origin_item/culture/diona_sol)
/datum/gear/suit/diona/eternal
display_name = "mesh weave robes"
@@ -33,7 +33,7 @@
cost = 1
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/narrows)
culture_restriction = list(/decl/origin_item/culture/narrows)
//skrell shared things
@@ -42,7 +42,7 @@
path = /obj/item/clothing/accessory/poncho/shouldercape
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/accessory/capes/diona/New()
..()
@@ -58,21 +58,21 @@
path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/accessory/weishii/diona
display_name = "dionae weishii robe"
path = /obj/item/clothing/accessory/poncho/shouldercape/weishiirobe
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/skrell_projector/diona
display_name = "dionae nralakk projector"
path = /obj/item/skrell_projector
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/homeworld_deck/diona
display_name = "dionae qweipaqui homeworld deck"
@@ -80,14 +80,14 @@
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
flags = GEAR_NO_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /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 = "dionae qweipaqui colonist deck"
path = /obj/item/deck/tarot/nonnralakk
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/accessory/skrell_passport/diona
display_name = "dionae nralakk federation passport"
@@ -97,7 +97,7 @@
sort_category = "Xenowear - Diona"
cost = 0
flags = GEAR_NO_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /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)
@@ -118,7 +118,7 @@
path = /obj/item/clothing/under/skrell/nralakk
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/uniform/work/diona/New()
..()
@@ -151,7 +151,7 @@
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/suit/jacket/diona/New()
..()
@@ -184,7 +184,7 @@
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/accessory/diona/poncho/New()
..()
@@ -201,7 +201,7 @@
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
flags = GEAR_HAS_DESC_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim)
culture_restriction = list(/decl/origin_item/culture/dionae_nralakk, /decl/origin_item/culture/eum, /decl/origin_item/culture/xrim)
/datum/gear/accessory/diona/workcloak/New()
..()
@@ -221,7 +221,7 @@
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(/singleton/origin_item/culture/dionae_moghes)
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
/datum/gear/suit/sash/diona
display_name = "dionae gyazo belt"
@@ -230,7 +230,7 @@
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(/singleton/origin_item/culture/dionae_moghes)
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
/datum/gear/suit/unathi_mantle/diona
display_name = "dionae peasant hide mantle selection"
@@ -241,7 +241,7 @@
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
flags = GEAR_HAS_COLOR_SELECTION
culture_restriction = list(/singleton/origin_item/culture/dionae_moghes)
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
/datum/gear/suit/unathi_mantle/diona/New()
..()
@@ -257,12 +257,12 @@
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(/singleton/origin_item/culture/dionae_moghes)
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
/datum/gear/suit/unathi_robe/kilt/diona
display_name = "dionae wasteland kilt"
path = /obj/item/clothing/suit/unathi/robe/kilt
origin_restriction = list(/singleton/origin_item/origin/dionae_wasteland)
origin_restriction = list(/decl/origin_item/origin/dionae_wasteland)
/datum/gear/uniform/unathi/diona
display_name = "dionae sinta tunic"
@@ -270,14 +270,14 @@
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(/singleton/origin_item/culture/dionae_moghes)
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
/datum/gear/head/sinta_ronin/diona
display_name = "dionae straw hat"
path = /obj/item/clothing/head/unathi
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/dionae_moghes)
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
/datum/gear/suit/robe_coat/diona
display_name = "dionae tzirzi robe"
@@ -285,13 +285,13 @@
cost = 1
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/dionae_moghes)
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
/datum/gear/eyes/wasteland_goggles/diona
display_name = "dionae wasteland goggles"
path = /obj/item/clothing/glasses/safety/goggles/wasteland
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
origin_restriction = list(/singleton/origin_item/origin/dionae_wasteland)
origin_restriction = list(/decl/origin_item/origin/dionae_wasteland)
sort_category = "Xenowear - Diona"
/datum/gear/uniform/diona/zozo
@@ -299,4 +299,4 @@
path = /obj/item/clothing/under/unathi/zozo
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
culture_restriction = list(/singleton/origin_item/culture/dionae_moghes)
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)

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

@@ -398,7 +398,7 @@
sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
origin_restriction = list(/singleton/origin_item/origin/free_council)
origin_restriction = list(/decl/origin_item/origin/free_council)
/datum/gear/tajaran_tarot
display_name = "adhomian divination cards deck"

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

@@ -21,7 +21,7 @@
path = /obj/item/clothing/accessory/poncho/unathimantle/forest
cost = 1
whitelisted = list(SPECIES_UNATHI)
origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles)
origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles)
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_COLOR_SELECTION
@@ -35,7 +35,7 @@
/datum/gear/suit/unathi_robe/kilt
display_name = "wasteland kilt"
origin_restriction = list(/singleton/origin_item/origin/wastelander)
origin_restriction = list(/decl/origin_item/origin/wastelander)
path = /obj/item/clothing/suit/unathi/robe/kilt
/datum/gear/suit/robe_coat
@@ -100,7 +100,7 @@
display_name = "wasteland goggles"
path = /obj/item/clothing/glasses/safety/goggles/wasteland
whitelisted = list(SPECIES_UNATHI)
origin_restriction = list(/singleton/origin_item/origin/wastelander)
origin_restriction = list(/decl/origin_item/origin/wastelander)
sort_category = "Xenowear - Unathi"
/datum/gear/accessory/sinta_hood
@@ -250,7 +250,7 @@
display_name = "shaman staff"
path = /obj/item/cane/shaman
sort_category = "Xenowear - Unathi"
origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles)
origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles)
whitelisted = list(SPECIES_UNATHI)
/datum/gear/suit/maxtlatl
@@ -259,7 +259,7 @@
cost = 1
whitelisted = list(SPECIES_UNATHI)
allowed_roles = list("Chaplain")
origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles)
origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles)
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_DESC_SELECTION
@@ -267,7 +267,7 @@
display_name = "Thakhist wristguards"
path = /obj/item/clothing/wrists/unathi/maxtlatl
whitelisted = list(SPECIES_UNATHI)
origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles)
origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles)
allowed_roles = list("Chaplain")
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_DESC_SELECTION
@@ -276,7 +276,7 @@
display_name = "Thakhist headgear"
path = /obj/item/clothing/head/unathi/maxtlatl
whitelisted = list(SPECIES_UNATHI)
origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles)
origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles)
allowed_roles = list("Chaplain")
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_DESC_SELECTION
@@ -286,7 +286,7 @@
path = /obj/item/clothing/accessory/poncho/rockstone
cost = 1
whitelisted = list(SPECIES_UNATHI)
origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles)
origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles)
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ADDITIONAL_COLOR_SELECTION
@@ -294,7 +294,7 @@
display_name = "jeweled bracers"
path = /obj/item/clothing/wrists/unathi/jeweled
whitelisted = list(SPECIES_UNATHI)
origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles)
origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles)
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -311,6 +311,6 @@
path = /obj/item/clothing/suit/unathi/jokfar
cost = 1
whitelisted = list(SPECIES_UNATHI)
origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles)
origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles)
sort_category = "Xenowear - Unathi"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION

46
code/modules/client/preference_setup/origin/origin.dm
View File

@@ -1,6 +1,6 @@
/mob/living/carbon/human
var/singleton/origin_item/culture/culture
var/singleton/origin_item/origin/origin
var/decl/origin_item/culture/culture
var/decl/origin_item/origin/origin
/datum/category_item/player_setup_item/origin
name = "Origin"
@@ -68,20 +68,20 @@
/datum/category_item/player_setup_item/origin/sanitize_character(var/sql_load = 0)
var/datum/species/S = all_species[pref.species]
if(!istext(pref.culture) || !ispath(text2path(pref.culture), /singleton/origin_item/culture))
var/singleton/origin_item/culture/CI = S.possible_cultures[1]
if(!istext(pref.culture) || !ispath(text2path(pref.culture), /decl/origin_item/culture))
var/decl/origin_item/culture/CI = S.possible_cultures[1]
pref.culture = "[CI]"
var/singleton/origin_item/culture/our_culture = GET_SINGLETON(text2path(pref.culture))
if(!istext(pref.origin) || !ispath(text2path(pref.origin), /singleton/origin_item/origin))
var/singleton/origin_item/origin/OI = pick(our_culture.possible_origins)
var/decl/origin_item/culture/our_culture = decls_repository.get_decl(text2path(pref.culture))
if(!istext(pref.origin) || !ispath(text2path(pref.origin), /decl/origin_item/origin))
var/decl/origin_item/origin/OI = pick(our_culture.possible_origins)
pref.origin = "[OI]"
else
var/singleton/origin_item/origin/origin_check = text2path(pref.origin)
var/decl/origin_item/origin/origin_check = text2path(pref.origin)
if(!(origin_check in our_culture.possible_origins))
to_client_chat(SPAN_WARNING("Your origin has been reset due to it being incompatible with your culture!"))
var/singleton/origin_item/origin/OI = pick(our_culture.possible_origins)
var/decl/origin_item/origin/OI = pick(our_culture.possible_origins)
pref.origin = "[OI]"
var/singleton/origin_item/origin/our_origin = GET_SINGLETON(text2path(pref.origin))
var/decl/origin_item/origin/our_origin = decls_repository.get_decl(text2path(pref.origin))
if(!(pref.citizenship in our_origin.possible_citizenships))
to_client_chat(SPAN_WARNING("Your previous citizenship is invalid for this origin! Resetting."))
pref.citizenship = our_origin.possible_citizenships[1]
@@ -97,8 +97,8 @@
if(SSrecords.init_state != SS_INITSTATE_DONE)
return "<center><large>Records controller not initialized yet. Please wait a bit and reload this section.</large></center>"
var/list/dat = list()
var/singleton/origin_item/culture/CL = GET_SINGLETON(text2path(pref.culture))
var/singleton/origin_item/origin/OR = GET_SINGLETON(text2path(pref.origin))
var/decl/origin_item/culture/CL = decls_repository.get_decl(text2path(pref.culture))
var/decl/origin_item/origin/OR = decls_repository.get_decl(text2path(pref.origin))
dat += "<b>Culture: </b><a href='?src=\ref[src];open_culture_menu=1'>[CL.name]</a><br>"
dat += "<i>- [CL.desc]</i>"
if(CL.important_information)
@@ -118,25 +118,25 @@
var/datum/species/S = all_species[pref.species]
if(href_list["open_culture_menu"])
var/list/options = list()
var/list/possible_cultures = Singletons.GetList(S.possible_cultures)
var/list/possible_cultures = decls_repository.get_decls(S.possible_cultures)
for(var/decl_type in possible_cultures)
var/singleton/origin_item/culture/CL = possible_cultures[decl_type]
var/decl/origin_item/culture/CL = possible_cultures[decl_type]
options[CL.name] = CL
var/result = input(user, "Choose your character's culture.", "Culture") as null|anything in options
var/singleton/origin_item/culture/chosen_culture = options[result]
var/decl/origin_item/culture/chosen_culture = options[result]
if(chosen_culture)
show_window(chosen_culture, "set_culture_data", user)
return TOPIC_HANDLED
if(href_list["open_origin_menu"])
var/list/options = list()
var/singleton/origin_item/culture/our_culture = GET_SINGLETON(text2path(pref.culture)) //plutonians be like
var/list/singleton/origin_item/origin/origins_list = Singletons.GetList(our_culture.possible_origins)
var/decl/origin_item/culture/our_culture = decls_repository.get_decl(text2path(pref.culture)) //plutonians be like
var/list/decl/origin_item/origin/origins_list = decls_repository.get_decls(our_culture.possible_origins)
for(var/decl_type in origins_list)
var/singleton/origin_item/origin/OR = origins_list[decl_type]
var/decl/origin_item/origin/OR = origins_list[decl_type]
options[OR.name] = OR
var/result = input(user, "Choose your character's origin.", "Origins") as null|anything in options
var/singleton/origin_item/origin/chosen_origin = options[result]
var/decl/origin_item/origin/chosen_origin = options[result]
if(chosen_origin)
show_window(chosen_origin, "set_origin_data", user)
return TOPIC_HANDLED
@@ -160,7 +160,7 @@
return TOPIC_REFRESH
if(href_list["citizenship"])
var/singleton/origin_item/origin/our_origin = GET_SINGLETON(text2path(pref.origin))
var/decl/origin_item/origin/our_origin = decls_repository.get_decl(text2path(pref.origin))
var/choice = input(user, "Please choose your current citizenship.", "Character Preference", pref.citizenship) as null|anything in our_origin.possible_citizenships
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
@@ -174,7 +174,7 @@
return TOPIC_REFRESH
if(href_list["religion"])
var/singleton/origin_item/origin/our_origin = GET_SINGLETON(text2path(pref.origin))
var/decl/origin_item/origin/our_origin = decls_repository.get_decl(text2path(pref.origin))
var/choice = input(user, "Please choose a religion.", "Character Preference", pref.religion) as null|anything in our_origin.possible_religions
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
@@ -188,7 +188,7 @@
return TOPIC_REFRESH
if(href_list["accent"])
var/singleton/origin_item/origin/our_origin = GET_SINGLETON(text2path(pref.origin))
var/decl/origin_item/origin/our_origin = decls_repository.get_decl(text2path(pref.origin))
var/choice = input(user, "Please choose an accent.", "Character Preference", pref.accent) as null|anything in our_origin.possible_accents
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
@@ -201,7 +201,7 @@
sanitize_character()
return TOPIC_REFRESH
/datum/category_item/player_setup_item/origin/proc/show_window(var/singleton/origin_item/OI, var/topic_data, var/mob/user)
/datum/category_item/player_setup_item/origin/proc/show_window(var/decl/origin_item/OI, var/topic_data, var/mob/user)
var/datum/browser/origin_win = new(user, topic_data, "Origins Selection")
var/dat = "<html><center><b>[OI.name]</center></b>"
dat += "<hr>[OI.desc]<br>"