mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 12:02:31 +01:00
New Origin Traits (#18792)
Adds two new origin traits - small pain resistance and a minor stamina increase. Currently Unathi from the Tza Prairie have the stamina boost and Unathi from the Zazalai Mountains have the pain reduction. Also adds drug & alcohol resistance to Crevan Tajara.
This commit is contained in:
@@ -165,6 +165,8 @@
|
||||
possible_accents = list(ACCENT_CREVAN)
|
||||
possible_citizenships = CITIZENSHIPS_ADHOMAI
|
||||
possible_religions = RELIGIONS_ADHOMAI
|
||||
origin_traits = list(TRAIT_ORIGIN_ALCOHOL_RESISTANCE, TRAIT_ORIGIN_DRUG_RESISTANCE)
|
||||
origin_traits_descriptions = list("have a higher alcoholic tolerance", "have a higher tolerance to recreative drugs")
|
||||
|
||||
/singleton/origin_item/origin/old_nobility
|
||||
name = "Pre-Contact Nobility"
|
||||
|
||||
@@ -39,6 +39,8 @@
|
||||
possible_accents = list(ACCENT_TZA_PEASANT)
|
||||
possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
|
||||
possible_religions = list(RELIGION_THAKH)
|
||||
origin_traits = list(TRAIT_ORIGIN_STAMINA_BONUS)
|
||||
origin_traits_descriptions = list("have slightly more stamina")
|
||||
|
||||
/singleton/origin_item/origin/tza_upper
|
||||
name = "Tza Prairie Upper Castes"
|
||||
@@ -49,6 +51,8 @@
|
||||
possible_accents = list(ACCENT_TZA_NOBLE)
|
||||
possible_citizenships = list(CITIZENSHIP_IZWESKI)
|
||||
possible_religions = list(RELIGION_THAKH)
|
||||
origin_traits = list(TRAIT_ORIGIN_STAMINA_BONUS)
|
||||
origin_traits_descriptions = list("have slightly more stamina")
|
||||
|
||||
/singleton/origin_item/origin/southlands_lower
|
||||
name = "Southlands Lower Castes"
|
||||
@@ -82,6 +86,8 @@
|
||||
possible_accents = list(ACCENT_ZAZ_LOW)
|
||||
possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
|
||||
possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_AUTAKH, RELIGION_SIAKH, RELIGION_NONE)
|
||||
origin_traits = list(TRAIT_ORIGIN_PAIN_RESISTANCE)
|
||||
origin_traits_descriptions = list("are slightly more resistant to pain")
|
||||
|
||||
/singleton/origin_item/origin/zazalai_upper
|
||||
name = "Zazalai Mountains Upper Castes"
|
||||
@@ -94,3 +100,5 @@
|
||||
possible_accents = list(ACCENT_ZAZ_HIGH)
|
||||
possible_citizenships = list(CITIZENSHIP_IZWESKI)
|
||||
possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_SIAKH, RELIGION_NONE)
|
||||
origin_traits = list(TRAIT_ORIGIN_PAIN_RESISTANCE)
|
||||
origin_traits_descriptions = list("are slightly more resistant to pain")
|
||||
|
||||
@@ -1491,6 +1491,8 @@
|
||||
brute_mod = species.brute_mod
|
||||
|
||||
max_stamina = species.stamina
|
||||
if(HAS_TRAIT(src, TRAIT_ORIGIN_STAMINA_BONUS))
|
||||
max_stamina *= 1.1
|
||||
stamina = max_stamina
|
||||
sprint_speed_factor = species.sprint_speed_factor
|
||||
sprint_cost_factor = species.sprint_cost_factor
|
||||
|
||||
@@ -639,6 +639,8 @@
|
||||
|
||||
sprint_speed_factor = species.sprint_speed_factor
|
||||
max_stamina = species.stamina
|
||||
if(HAS_TRAIT(src, TRAIT_ORIGIN_STAMINA_BONUS))
|
||||
max_stamina *= 1.1
|
||||
stamina_recovery = species.stamina_recovery
|
||||
sprint_cost_factor = species.sprint_cost_factor
|
||||
move_delay_mod = 0
|
||||
|
||||
@@ -1571,6 +1571,8 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
var/last_pain = pain
|
||||
if(owner)
|
||||
amount *= owner.species.pain_mod
|
||||
if(HAS_TRAIT(owner, TRAIT_ORIGIN_PAIN_RESISTANCE))
|
||||
amount = max(amount-1, 1)
|
||||
amount -= (owner.chem_effects[CE_PAINKILLER]/3)
|
||||
if(amount <= 0)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user