Skip to content

Commit

Permalink
FF species
Browse files Browse the repository at this point in the history
  • Loading branch information
Iajret committed Nov 23, 2023
1 parent c068745 commit 0475ead
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
8 changes: 5 additions & 3 deletions tff_modular/modules/nabbers/code/_nabbers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
H.apply_damage(NABBER_DAMAGE_ONBURNING, OXY)

/datum/species/nabber/randomize_features(mob/living/carbon/human/human_mob)
var/list/features = ..()
var/main_color
var/random = rand(1,6)
switch(random)
Expand All @@ -102,9 +103,10 @@
main_color = "#c0ad00"
if(6)
main_color = "#e6ff03"
human_mob.dna.features["mcolor"] = main_color
human_mob.dna.features["mcolor2"] = main_color
human_mob.dna.features["mcolor3"] = main_color
features["mcolor"] = main_color
features["mcolor2"] = main_color
features["mcolor3"] = main_color
return features

/datum/species/nabber/prepare_human_for_preview(mob/living/carbon/human/nabber)
var/nabber_color = "#00ac1d"
Expand Down
13 changes: 6 additions & 7 deletions tff_modular/modules/teshari_reborn/code/teshari.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
LOADOUT_ITEM_ACCESSORY = TESHARI_ACCESSORIES_ICON,
LOADOUT_ITEM_EARS = TESHARI_EARS_ICON
)
default_mutant_bodyparts = list(
"legs" = "Normal Legs"
)
coldmod = TESHARI_ALT_COLDMOD
heatmod = TESHARI_ALT_HEATMOD
bodytemp_normal = BODYTEMP_NORMAL + (TEHSARI_ALT_TEMP_OFFSET/2)
Expand Down Expand Up @@ -76,15 +73,17 @@
. = ..()
teshari_agility.Destroy()
teshari_echolocation.Destroy()
qdel(C.GetComponent(/datum/component/weak_body))
C.mob_size = initial(C.mob_size)

/datum/species/teshari/alt/randomize_features(mob/living/carbon/human/human_mob)
. = ..()
var/list/features = ..()
var/main_color = pick(COLOR_GRAY, COLOR_DARK_BROWN, COLOR_ALMOST_BLACK, COLOR_DARK_RED, COLOR_DARK_CYAN)
var/second_color = pick(COLOR_WHITE, COLOR_BLACK, COLOR_BLUE, COLOR_VIOLET)
human_mob.dna.features["mcolor"] = main_color
human_mob.dna.features["mcolor2"] = second_color
human_mob.dna.features["mcolor3"] = second_color
features["mcolor"] = main_color
features["mcolor2"] = second_color
features["mcolor3"] = second_color
return features

/datum/species/teshari/alt/create_pref_unique_perks()
var/list/perk_descriptions = list()
Expand Down

0 comments on commit 0475ead

Please sign in to comment.