mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +01:00
Dionae loadout fix (#14789)
This commit is contained in:
Yonnimer
@@ -1535,6 +1535,7 @@
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_utility.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_wrists.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_xeno.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_xeno\diona.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_xeno\human.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_xeno\machine.dm"
|
||||
#include "code\modules\client\preference_setup\loadout\loadout_xeno\skrell.dm"
|
||||
|
||||
@@ -38,11 +38,11 @@
|
||||
//skrell shared things
|
||||
|
||||
/datum/gear/accessory/capes/diona
|
||||
display_name = "shoulder capes"
|
||||
display_name = "dionae 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)
|
||||
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()
|
||||
..()
|
||||
@@ -54,50 +54,50 @@
|
||||
gear_tweaks += new /datum/gear_tweak/path(capes)
|
||||
|
||||
/datum/gear/accessory/qeblak/diona
|
||||
display_name = "qeblak mantle"
|
||||
display_name = "dionae 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)
|
||||
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 = "weishii robe"
|
||||
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(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/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 = "nralakk projector"
|
||||
display_name = "dionae 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)
|
||||
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 = "qweipaqui homeworld deck"
|
||||
path = /obj/item/deck/tarot/jargon
|
||||
display_name = "dionae qweipaqui homeworld deck"
|
||||
path = /obj/item/deck/tarot/nralakk
|
||||
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)
|
||||
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 = "qweipaqui colonist deck"
|
||||
path = /obj/item/deck/tarot/nonjargon
|
||||
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(/decl/origin_item/culture/dionae_jargon, /decl/origin_item/culture/eum, /decl/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 = "jargon federation passport"
|
||||
path = /obj/item/clothing/accessory/badge/passport/jargon
|
||||
display_name = "dionae nralakk federation passport"
|
||||
path = /obj/item/clothing/accessory/badge/passport/nralakk
|
||||
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)
|
||||
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)
|
||||
@@ -106,7 +106,7 @@
|
||||
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/obj/item/clothing/accessory/badge/passport/nralakk/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)
|
||||
@@ -114,44 +114,44 @@
|
||||
return J
|
||||
|
||||
/datum/gear/uniform/work/diona
|
||||
display_name = "work uniforms"
|
||||
path = /obj/item/clothing/under/skrell/jargon
|
||||
display_name = "dionae work uniforms"
|
||||
path = /obj/item/clothing/under/skrell/nralakk
|
||||
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)
|
||||
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()
|
||||
..()
|
||||
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
|
||||
outfit["ox research"] = /obj/item/clothing/under/skrell/nralakk
|
||||
outfit["ox security"] = /obj/item/clothing/under/skrell/nralakk/ox
|
||||
outfit["ox engineer"] = /obj/item/clothing/under/skrell/nralakk/ox/engineer
|
||||
outfit["ox service"] = /obj/item/clothing/under/skrell/nralakk/ox/service
|
||||
outfit["ox medical"] = /obj/item/clothing/under/skrell/nralakk/ox/med
|
||||
outfit["ix research"] = /obj/item/clothing/under/skrell/nralakk/ix
|
||||
outfit["ix security"] = /obj/item/clothing/under/skrell/nralakk/ix/security
|
||||
outfit["ix engineer"] = /obj/item/clothing/under/skrell/nralakk/ix/engineer
|
||||
outfit["ix service"] = /obj/item/clothing/under/skrell/nralakk/ix/service
|
||||
outfit["ix medical"] = /obj/item/clothing/under/skrell/nralakk/ix/med
|
||||
outfit["oqi research"] = /obj/item/clothing/under/skrell/nralakk/oqi
|
||||
outfit["oqi security"] = /obj/item/clothing/under/skrell/nralakk/oqi/security
|
||||
outfit["oqi engineer"] = /obj/item/clothing/under/skrell/nralakk/oqi/engineer
|
||||
outfit["oqi service"] = /obj/item/clothing/under/skrell/nralakk/oqi/service
|
||||
outfit["oqi medical"] = /obj/item/clothing/under/skrell/nralakk/oqi/med
|
||||
outfit["iqi research"] = /obj/item/clothing/under/skrell/nralakk/iqi
|
||||
outfit["iqi security"] = /obj/item/clothing/under/skrell/nralakk/iqi/security
|
||||
outfit["iqi engineer"] = /obj/item/clothing/under/skrell/nralakk/iqi/engineer
|
||||
outfit["iqi service"] = /obj/item/clothing/under/skrell/nralakk/iqi/service
|
||||
outfit["iqi medical"] = /obj/item/clothing/under/skrell/nralakk/iqi/med
|
||||
gear_tweaks += new /datum/gear_tweak/path(outfit)
|
||||
|
||||
/datum/gear/suit/jacketdiona/
|
||||
display_name = "work jackets"
|
||||
display_name = "dionae 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)
|
||||
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()
|
||||
..()
|
||||
@@ -179,12 +179,12 @@
|
||||
gear_tweaks += new /datum/gear_tweak/path(jacket)
|
||||
|
||||
/datum/gear/accessory/diona/poncho
|
||||
display_name = "skrell poncho"
|
||||
display_name = "dionae 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)
|
||||
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()
|
||||
..()
|
||||
@@ -196,12 +196,12 @@
|
||||
gear_tweaks += new /datum/gear_tweak/path(poncho)
|
||||
|
||||
/datum/gear/accessory/diona/workcloak
|
||||
display_name = "work cloaks"
|
||||
display_name = "dionae 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)
|
||||
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()
|
||||
..()
|
||||
@@ -215,7 +215,7 @@
|
||||
//unathi shared things
|
||||
|
||||
/datum/gear/accessory/sinta_hood/diona
|
||||
display_name = "clan hood"
|
||||
display_name = "dionae clan hood"
|
||||
slot = slot_head
|
||||
path = /obj/item/clothing/accessory/sinta_hood
|
||||
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
|
||||
@@ -224,7 +224,7 @@
|
||||
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
|
||||
|
||||
/datum/gear/suit/sash/diona
|
||||
display_name = "gyazo belt"
|
||||
display_name = "dionae gyazo belt"
|
||||
path = /obj/item/clothing/accessory/unathi
|
||||
cost = 1
|
||||
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
|
||||
@@ -233,7 +233,7 @@
|
||||
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
|
||||
|
||||
/datum/gear/suit/unathi_mantle/diona
|
||||
display_name = "peasant hide mantle selection"
|
||||
display_name = "dionae 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
|
||||
@@ -251,7 +251,7 @@
|
||||
gear_tweaks += new /datum/gear_tweak/path(mantles)
|
||||
|
||||
/datum/gear/suit/unathi_robe/diona
|
||||
display_name = "roughspun robe"
|
||||
display_name = "dionae roughspun robe"
|
||||
path = /obj/item/clothing/suit/unathi/robe
|
||||
cost = 1
|
||||
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
|
||||
@@ -260,12 +260,12 @@
|
||||
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
|
||||
|
||||
/datum/gear/suit/unathi_robe/kilt
|
||||
display_name = "wasteland kilt"
|
||||
display_name = "dionae 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"
|
||||
display_name = "dionae sinta tunic"
|
||||
path = /obj/item/clothing/under/unathi
|
||||
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
|
||||
sort_category = "Xenowear - Diona"
|
||||
@@ -273,14 +273,14 @@
|
||||
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
|
||||
|
||||
/datum/gear/head/sinta_ronin/diona
|
||||
display_name = "straw hat"
|
||||
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(/decl/origin_item/culture/dionae_moghes)
|
||||
|
||||
/datum/gear/suit/robe_coat/diona
|
||||
display_name = "tzirzi robe"
|
||||
display_name = "dionae tzirzi robe"
|
||||
path = /obj/item/clothing/suit/unathi/robe/robe_coat
|
||||
cost = 1
|
||||
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
|
||||
@@ -288,14 +288,14 @@
|
||||
culture_restriction = list(/decl/origin_item/culture/dionae_moghes)
|
||||
|
||||
/datum/gear/eyes/wasteland_goggles/diona
|
||||
display_name = "wasteland goggles"
|
||||
display_name = "dionae 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"
|
||||
display_name = "dionae zozo top"
|
||||
path = /obj/item/clothing/under/unathi/zozo
|
||||
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
|
||||
sort_category = "Xenowear - Diona"
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
################################
|
||||
# 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:
|
||||
- bugfix: "Gets the Dionae loadout working, as well as ensure that all items in that used jargon use Nralakk instead. "
|
||||
Reference in New Issue
Block a user