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

Adds new dionae origins/cultures (#16684)

Browse Source 
* Adds the voidtamer #include

* Adds the mitclan origin

* Adds the voidtamer culture/origins

* Gives the voidtamer factions unathi items

* Makes the new culture selectable

* Changelog

* .dm

* Correctly restricts the loadout stuff this time

* forgetti to remove dionae_

* i am big dumb
This commit is contained in:
Yonnimer
2023-07-13 21:41:49 +00:00
committed by GitHub
parent bb45a45bc3
commit 26198afa72
6 changed files with 103 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aurorastation.dme
+1
View File
@@ -1463,6 +1463,7 @@
#include "code\modules\background\origins\origins\diona\narrows.dm"
#include "code\modules\background\origins\origins\diona\nralakk.dm"
#include "code\modules\background\origins\origins\diona\sol.dm"
#include "code\modules\background\origins\origins\diona\voidtamer.dm"
#include "code\modules\background\origins\origins\diona\xrim.dm"
#include "code\modules\background\origins\origins\human\biesel.dm"
#include "code\modules\background\origins\origins\human\coalition.dm"
code/modules/background/origins/origins/diona/sol.dm
+9 -1
View File
@@ -3,7 +3,8 @@
desc = "Despite the loss of much of its territory during the Solarian Collapse of 2463, most of those that fall under the general umbrella of Solarian culture are citizens or belong to statelets affiliated with the Alliance of Sovereign Solarian Nations (ASSN). By and large, Solarians are generally perceived as xenophobic, nationalistic, and militarist. Non-humans, aside from Skrell, are generally rare on Solarian worlds, and many that do reside on them are treated as second-class citizens at best."
possible_origins = list(
/singleton/origin_item/origin/diona_sol,
/singleton/origin_item/origin/sol_wildborn
/singleton/origin_item/origin/sol_wildborn,
/singleton/origin_item/origin/diona_mictlan
)
/singleton/origin_item/origin/diona_sol
@@ -21,3 +22,10 @@
possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG)
possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION)
possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE)
/singleton/origin_item/origin/diona_mictlan
name = "The Primitive Sirens of Mictlan"
desc = "Largerly hailing from the city of Fallowed Meadows, The Primitive Sirens are a group of Dionae who, upon the completion of their Solarian debt, settled on Mictlan, managing to assimilate into Mictlan society."
possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG)
possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION)
possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE)
code/modules/background/origins/origins/diona/voidtamer.dm
+39
View File
@@ -0,0 +1,39 @@
/singleton/origin_item/culture/diona_voidtamer
name = "Voidtamers"
desc = "Far from being a unified entity, the term “Void Tamers” refers to a series of commonly dionae-centric groups and clusters known for the taming, raising, and eventual selling of products related to space fauna, commonly space carp, gnats, and bloaters. These groups are largely independent of one another, operating in generally separate regions of space, although some overlap and trade has been known to occur amongst groups."
possible_origins = list(
/singleton/origin_item/origin/emporium,
/singleton/origin_item/origin/comets,
/singleton/origin_item/origin/rokz,
/singleton/origin_item/origin/serz
)
/singleton/origin_item/origin/emporium
name = "Emporium Voidtamer"
desc = "The largest of the Voidtamers, The Emporium is a highly mobile cluster known for selling living space fauna in exchange for credits and blood throughout Biesel and CoC space, however, more recently have begun to venture into the CRZ looking for customers. "
important_information = "Dionae from this cluster tend to come in every form and mind type, although primarily will still be cyclops forms. Dionae from voidtamer groups tend to be highly knowledgeable on spacefauna-related subjects due to their previous work."
possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_CRIMSONSONG, ACCENT_IRONSONG)
possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION)
possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE)
/singleton/origin_item/origin/comets
name = "Comets Voidtamer"
desc = "The Comets of Commerce are a smaller-to-medium sized Voidtamer cluster known for primarily trading with the Scarabs and other space-based groups operating within the Coalition of Colonies."
important_information = "Dionae from this cluster tend to have more egalitarian mind types, preferring to have decisions be made amongst the entire gestalt over a sole leader. Dionae from voidtamer groups tend to be highly knowledgeable on spacefauna-related subjects due to their previous work."
possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_CRIMSONSONG, ACCENT_IRONSONG)
possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_COALITION)
possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE)
/singleton/origin_item/origin/rokz
name = "Rokz Voidtamer"
desc = "One of two competing voidtamer clans found operating near Moghes. Due to their history interacting Unathi, both clans tend to be fairly influenced by Unathi culture and religion, although do still a distinct identity from one another."
possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG, ACCENT_CRIMSONSONG, ACCENT_SANDSONG, ACCENT_WASTESONG)
possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_OTHER)
/singleton/origin_item/origin/serz
name = "Serz Voidtamer"
desc = "One of two competing voidtamer clans found operating near Moghes. Due to their history interacting Unathi, both clans tend to be fairly influenced by Unathi culture and religion, although do still a distinct identity from one another."
possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG, ACCENT_CRIMSONSONG, ACCENT_SANDSONG, ACCENT_WASTESONG)
possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_OTHER)
code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm
+10 -10
View File
@@ -255,7 +255,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(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer)
/datum/gear/suit/sash/diona
display_name = "dionae gyazo belt"
@@ -264,7 +264,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(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer)
/datum/gear/suit/unathi_mantle/diona
display_name = "dionae peasant hide mantle selection"
@@ -275,7 +275,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(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer)
/datum/gear/suit/unathi_mantle/diona/New()
..()
@@ -291,14 +291,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(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer)
/datum/gear/suit/unathi_robe/kilt/diona
display_name = "dionae wasteland kilt"
path = /obj/item/clothing/suit/unathi/robe/kilt
whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Diona"
origin_restriction = list(/singleton/origin_item/origin/dionae_wasteland)
origin_restriction = list(/singleton/origin_item/origin/dionae_wasteland, /singleton/origin_item/origin/rokz, /singleton/origin_item/origin/serz)
/datum/gear/uniform/unathi/diona
display_name = "dionae sinta tunic"
@@ -306,14 +306,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(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer)
/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(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer)
/datum/gear/suit/robe_coat/diona
display_name = "dionae tzirzi robe"
@@ -321,13 +321,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(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer)
/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(/singleton/origin_item/origin/dionae_wasteland, /singleton/origin_item/origin/rokz, /singleton/origin_item/origin/serz)
sort_category = "Xenowear - Diona"
/datum/gear/uniform/diona/zozo
@@ -335,4 +335,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(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer)
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+2 -1
View File
@@ -124,7 +124,8 @@
/singleton/origin_item/culture/dionae_moghes,
/singleton/origin_item/culture/dionae_nralakk,
/singleton/origin_item/culture/diona_coalition,
/singleton/origin_item/culture/deep_space
/singleton/origin_item/culture/deep_space,
/singleton/origin_item/culture/diona_voidtamer
)
alterable_internal_organs = list()
html/changelogs/Yonnimer-voidtameraccents.yml
+42
View File
@@ -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: "Adds a voidtamer origin and culture set for Dionae."
- rscadd: "Adds a Mictlan origin for Dionae"