diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index ad9d5ae5ab..7cf8b3de5e 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -84,8 +84,9 @@ #define SPECIES_SLIMEPERSON "slime_person" #define SPECIES_LUMINESCENT "luminescent" #define SPECIES_STARGAZER "stargazer" -#define SPECIES_LIZARD "lizard" -#define SPECIES_ASHWALKER "ashwalker" +#define SPECIES_LIZARD "sinta'unathi" +#define SPECIES_YEOSA "yeosa'unathi" +#define SPECIES_ASHWALKER "rksh'unathi" #define SPECIES_KOBOLD "kobold" #define SPECIES_MONKEY "monkey" #define SPECIES_MOTH "moth" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index bbe4038843..7204785784 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -94,6 +94,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/staminamod = 1 ///multiplier for stun durations var/stunmod = 1 + ///multiplier for oxy damage + var/oxymod = 1 ///Type of damage attack does. Ethereals attack with burn damage for example. var/attack_type = BRUTE ///Lowest possible punch damage this species can give. If this is set to 0, punches will always miss. diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 9ce11b4cbc..19795c6a21 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -10,6 +10,8 @@ mutant_organs = list(/obj/item/organ/tail/lizard) coldmod = 1.5 heatmod = 0.67 + species_age_min = 22 + species_age_max = 200 default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "face_markings" = "None", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "body_size" = "Normal") changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT attack_verb = "slash" @@ -48,7 +50,7 @@ // Lizards are coldblooded and can stand a greater temperature range than humans bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 20 // This puts lizards 10 above lavaland max heat for ash lizards. bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT - 10 - loreblurb = "The Unathi are a cold-blooded reptilian species originating from the planet Moghes, in the Uuoea-Esa system. A warrior culture with emphasis on honor, family, and loyalty to one's clan, the divided Unathi find themselves as powerful a force as any other species despite their less than hospitable homeworld." + loreblurb = "The Sinta'Unathi are a cold-blooded reptilian species originating from the harsh mainland of the planet Moghes, in the Uuoea-Esa system. A warrior culture with emphasis on honor, family, and loyalty to one's clan, the divided Sinta'Unathi find themselves as powerful a force as any other species despite their less than hospitable homeworld." ass_image = 'icons/ass/asslizard.png' var/datum/action/innate/liz_lighter/internal_lighter @@ -108,13 +110,57 @@ Lizard subspecies: ASHWALKERS */ /datum/species/lizard/ashwalker - name = "Ash Walker" + name = "Rksh'Unathi" id = SPECIES_ASHWALKER + species_age_min = 18 + species_age_max = 300 examine_limb_id = SPECIES_LIZARD species_traits = list(MUTCOLORS,EYECOLOR,LIPS, NO_UNDERWEAR) inherent_traits = list(TRAIT_CHUNKYFINGERS,TRAIT_NOBREATH) species_language_holder = /datum/language_holder/lizard/ash digitigrade_customization = DIGITIGRADE_FORCED + loreblurb = "The Rksh'Unathi are a mysterious reptilian species scattered across numerous planets, but only where the Necropolis' tendrils have scarred the land. While they are genetically related to the other species of Unathi, it is unclear how they came to be." + + +/* +Lizard subspecies: YEOSA'UNATHI +*/ +/datum/species/lizard/yeosa + name = "Yeosa'Unathi" + id = SPECIES_YEOSA + species_age_min = 22 + species_age_max = 200 + examine_limb_id = SPECIES_LIZARD + inherent_traits = list(TRAIT_ALCOHOL_TOLERANCE) + species_language_holder = /datum/language_holder/yeosa + coldmod = 2 + heatmod = 0.7 + burnmod = 1.25 + siemens_coeff = 1.25 + oxymod = 0.75 + grad_color="#fffec4" + + // Yeosa are more cold-blooded than Sinta, and thus should be less cozy in bad temps. + bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 10 // This puts lizards 10 above lavaland max heat for ash lizards. + bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT - 5 + loreblurb = "The Yeosa'Unathi are a cold-blooded reptilian species originating from the depths of the ocean on the planet Moghes, in the Uuoea-Esa system. Most Yeosa'Unathi will seldom step on the surface except to sunbathe - this can leave the impression of laziness and lethargy on those who interact with them. However, their culture largely mirrors that of the Sinta, and they are equally proud. " + + +//WS Edit Start - Kobold +//Ashwalker subspecies: KOBOLD +/datum/species/lizard/ashwalker/kobold + name = "Kobold" + id = SPECIES_KOBOLD + examine_limb_id = SPECIES_LIZARD + species_traits = list(MUTCOLORS,EYECOLOR,LIPS, NO_UNDERWEAR) + inherent_traits = list(TRAIT_CHUNKYFINGERS,TRAIT_NOBREATH) + species_language_holder = /datum/language_holder/lizard/ash + +/datum/species/lizard/ashwalker/kobold/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) + . = ..() //call everything from species/on_species_gain() + C.dna.add_mutation(DWARFISM) +//WS Edit End - Kobold + //WS Edit Start - Kobold //Ashwalker subspecies: KOBOLD diff --git a/config/game_options.txt b/config/game_options.txt index efd007627e..11fa809e50 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -434,6 +434,7 @@ ROUNDSTART_RACES felinid ROUNDSTART_RACES kepori ROUNDSTART_RACES rachnid ROUNDSTART_RACES vox +ROUNDSTART_RACES yeosa ## Races that are better than humans in some ways, but worse in others ROUNDSTART_RACES ethereal