cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22: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

2
code/modules/mob/living/carbon/human/species/species.dm
View File

@@ -213,7 +213,7 @@
var/list/allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA)
var/list/allowed_religions = list(RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_JUDAISM, RELIGION_HINDU, RELIGION_BUDDHISM, RELIGION_MOROZ, RELIGION_TRINARY, RELIGION_SCARAB)
var/default_citizenship = CITIZENSHIP_BIESEL
var/zombie_type //What zombie species they become
var/list/character_color_presets

5
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
View File

@@ -19,8 +19,8 @@
light_power = 0.5
meat_type = /obj/item/stack/material/steel
unarmed_types = list(
/datum/unarmed_attack/punch,
/datum/unarmed_attack/stomp,
/datum/unarmed_attack/punch,
/datum/unarmed_attack/stomp,
/datum/unarmed_attack/kick)
rarity_value = 2
@@ -108,6 +108,7 @@
max_hydration_factor = -1
allowed_citizenships = list(CITIZENSHIP_NONE, CITIZENSHIP_BIESEL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ERIDANI)
default_citizenship = CITIZENSHIP_NONE
// Special snowflake machine vars.
var/sprint_temperature_factor = 1.15

1
code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm
View File

@@ -61,6 +61,7 @@
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA)
allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_MOROZ)
default_citizenship = CITIZENSHIP_JARGON
zombie_type = "Skrell Zombie"

3
code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm
View File

@@ -67,7 +67,8 @@
default_h_style = "Tajaran Ears"
allowed_citizenships = list(CITIZENSHIP_PRA, CITIZENSHIP_BIESEL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA)
allowed_citizenships = list(CITIZENSHIP_PRA, CITIZENSHIP_DPRA, CITIZENSHIP_NKA)
default_citizenship = CITIZENSHIP_PRA
allowed_religions = list(RELIGION_TWINSUNS, RELIGION_MATAKE, RELIGION_RASKARA, RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_MOROZ)
zombie_type = "Tajara Zombie"

1
code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm
View File

@@ -85,6 +85,7 @@
allowed_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_DOMINIA, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI)
allowed_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_AUTAKH, RELIGION_MOROZ, RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM)
default_citizenship = CITIZENSHIP_IZWESKI
zombie_type = "Unathi Zombie"

1
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm
View File

@@ -118,6 +118,7 @@
allowed_citizenships = list(CITIZENSHIP_ZORA, CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_ERIDANI, CITIZENSHIP_JARGON)
allowed_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_PILOTDREAM, RELIGION_NONE, RELIGION_OTHER)
default_citizenship = CITIZENSHIP_ZORA
/datum/species/bug/before_equip(var/mob/living/carbon/human/H)
. = ..()