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

Tajaran update: the war to end all wars edition (#7638)

Browse Source 
-changes how the tajara species handles citizenship in game: you now have to pick one of the three factions, this also enables consular officers for them
-adds a new var to the species: default_citizenship, which citizenship should be the default one for that species, so you can have species that can't get biesel citizenship as their main one
-adds a bunch of loadout options to the tajaran section
-restricts tajara from being necropolis contractors
This commit is contained in:
Alberyk
2019-12-21 07:58:34 -03:00
committed by Erki
parent ce805b9d65
commit 038a4ac86b
45 changed files with 1444 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,4 +28,8 @@
/datum/gear/dromedaryco
display_name = "dromedaryco cigarette packet"
path = /obj/item/storage/fancy/cigarettes/dromedaryco
path = /obj/item/storage/fancy/cigarettes/dromedaryco
/datum/gear/pracigarette
display_name = "working tajara cigarette packet"
path = /obj/item/storage/fancy/cigarettes/pra

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

@@ -1,6 +1,6 @@
/datum/gear/gloves/tajara
display_name = "tajara gloves selection"
description = "A selection of tajaran colored gloves."
description = "A selection of tajaran gloves."
path = /obj/item/clothing/gloves/black/tajara
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
@@ -16,6 +16,7 @@
taj_gloves["brown gloves"] = /obj/item/clothing/gloves/brown/tajara
taj_gloves["green gloves"] = /obj/item/clothing/gloves/green/tajara
taj_gloves["white gloves"] = /obj/item/clothing/gloves/white/tajara
taj_gloves["machinist gloves"] = /obj/item/clothing/gloves/black/tajara/smithgloves
gear_tweaks += new/datum/gear_tweak/path(taj_gloves)
/datum/gear/suit/tajara_coat
@@ -28,11 +29,11 @@
/datum/gear/suit/tajara_coat/New()
..()
var/coat = list()
coat["tajaran naval coat"] = /obj/item/clothing/suit/storage/tajaran
coat["tajaran naval coat"] = /obj/item/clothing/suit/storage/toggle/tajaran
coat["commoner cloak"] = /obj/item/clothing/suit/storage/tajaran/cloak
coat["royal cloak"] = /obj/item/clothing/suit/storage/tajaran/cloak/fancy
coat["gruff cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran
coat["adhomian wool coat"] = /obj/item/clothing/suit/storage/tajaran/nomad
coat["adhomian wool coat"] = /obj/item/clothing/suit/storage/tajaran
gear_tweaks += new/datum/gear_tweak/path(coat)
/datum/gear/suit/tajara_priest
@@ -48,6 +49,7 @@
robes["sun priest robe"] = /obj/item/clothing/suit/storage/hooded/tajaran/priest
robes["sun sister robe"] = /obj/item/clothing/suit/storage/tajaran/messa
robes["matake priest mantle"] = /obj/item/clothing/suit/storage/tajaran/matake
robes["Azubarre priest robes"] = /obj/item/clothing/suit/storage/tajaran/azubarre
gear_tweaks += new/datum/gear_tweak/path(robes)
/datum/gear/suit/tajaran_labcoat
@@ -71,6 +73,9 @@
uniform["fancy uniform"] = /obj/item/clothing/under/tajaran/fancy
uniform["NanoTrasen overalls"] = /obj/item/clothing/under/tajaran/nt
uniform["matake priest garments"] = /obj/item/clothing/under/tajaran/matake
uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer
uniform["adhomian summer pants"] = /obj/item/clothing/under/pants/tajaran
uniform["machinist uniform"] = /obj/item/clothing/under/mechanic
gear_tweaks += new/datum/gear_tweak/path(uniform)
/datum/gear/uniform/tajara_dress
@@ -89,6 +94,8 @@
dress["red fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran/red
dress["red noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy
dress["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black
dress["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black
dress["adhomian summmer dress"] = /obj/item/clothing/under/dress/tajaran/summer
gear_tweaks += new/datum/gear_tweak/path(dress)
/datum/gear/accessory/tajara
@@ -165,4 +172,11 @@
display_name = "honorary party member card"
path = /obj/item/clothing/accessory/badge/hadii_card
sort_category = "Xenowear - Tajara"
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
/datum/gear/gloves/shumalia_belt
display_name = "hammer buckle belt"
description = "A leather belt adorned by a hammer shaped buckle, worn by priesthood and worshippers of Shumaila."
path = /obj/item/storage/belt/shumaila_buckle
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"