Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STARFLY'S FIRST NEW SPECIES: YEOSA'UNATHI #33

Merged
merged 4 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,33 +74,34 @@
//Defines for Species IDs
#define SPECIES_ABDUCTOR "abductor"
#define SPECIES_ANDROID "android"
#define SPECIES_ASHWALKER "ashwalker"
#define SPECIES_CORPORATE "corporate"
#define SPECIES_DULLAHAN "dullahan"
#define SPECIES_ETHEREAL "ethereal"
#define SPECIES_FLYPERSON "fly"
#define SPECIES_GOOFZOMBIE "krokodil_zombie"
#define SPECIES_HUMAN "human"
#define SPECIES_IPC "ipc"
#define SPECIES_JELLYPERSON "jelly"
#define SPECIES_SLIMEPERSON "slime_person"
#define SPECIES_LUMINESCENT "luminescent"
#define SPECIES_STARGAZER "stargazer"
#define SPECIES_LIZARD "lizard"
#define SPECIES_ASHWALKER "ashwalker"
#define SPECIES_KEPORI "kepori"
#define SPECIES_KOBOLD "kobold"
#define SPECIES_LIZARD "lizard"
#define SPECIES_LUMINESCENT "luminescent"
#define SPECIES_MONKEY "monkey"
#define SPECIES_MOTH "moth"
#define SPECIES_PLASMAMAN "plasmaman"
#define SPECIES_POD "pod"
#define SPECIES_RACHNID "rachnid"
#define SPECIES_SHADOW "shadow"
#define SPECIES_SKELETON "skeleton"
#define SPECIES_SLIMEPERSON "slime_person"
#define SPECIES_SNAIL "snail"
#define SPECIES_RACHNID "rachnid"
#define SPECIES_KEPORI "kepori"
#define SPECIES_STARGAZER "stargazer"
#define SPECIES_VAMPIRE "vampire"
#define SPECIES_VOX "vox"
#define SPECIES_ZOMBIE "zombie"
#define SPECIES_GOOFZOMBIE "krokodil_zombie"
#define SPECIES_XENOMORPH "xenomorph"
#define SPECIES_YEOSA "yeosa"
#define SPECIES_ZOMBIE "zombie"

#define DIGITIGRADE_NEVER 0
#define DIGITIGRADE_OPTIONAL 1
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
52 changes: 49 additions & 3 deletions code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/species/lizard
// Reptilian humanoids with scaled skin and tails.
name = "\improper Unathi"
name = "\improper Sinta'Unathi"
id = SPECIES_LIZARD
default_color = "00FF00"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,SCLERA,EMOTE_OVERLAY,MUTCOLORS_SECONDARY)
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion tgui/packages/tgui/interfaces/ScannerGate.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ const TARGET_SPECIES_LIST = [
value: 'human',
},
{
name: 'Unathi',
name: 'SintaUnathi',
value: 'lizard',
},
{
name: 'YeosaUnathi',
value: 'yeosa',
},
{
name: 'Flyperson',
value: 'fly',
Expand Down
Loading