Skip to content
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
4 changes: 2 additions & 2 deletions code/controllers/subsystem/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
feature_list[FEATURE_TAILSPINES] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/tail_spines)
feature_list[FEATURE_TAIL_LIZARD] = INIT_ACCESSORY(/datum/sprite_accessory/tails/lizard)
// moths
feature_list[FEATURE_MOTH_WINGS] = INIT_ACCESSORY(/datum/sprite_accessory/moth_wings)
feature_list[FEATURE_MOTH_ANTENNAE] = INIT_ACCESSORY(/datum/sprite_accessory/moth_antennae)
feature_list[FEATURE_MOTH_WINGS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/moth_wings) // REDSHIFT EDIT - feature_list[FEATURE_MOTH_WINGS] = INIT_ACCESSORY(/datum/sprite_accessory/moth_wings)
feature_list[FEATURE_MOTH_ANTENNAE] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/moth_antennae) // REDSHIFT EDIT - feature_list[FEATURE_MOTH_ANTENNAE] = INIT_ACCESSORY(/datum/sprite_accessory/moth_antennae)
feature_list[FEATURE_MOTH_MARKINGS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/moth_markings)
// generic wings
feature_list[FEATURE_WINGS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/wings)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences/middleware/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

var/mob/living/carbon/human/dummy/consistent/dummy = new
dummy.set_species(species_type)
dummy.equipOutfit(/datum/outfit/job/assistant/consistent, visuals_only = TRUE)
dummy.equipOutfit(species_type.preview_outfit, visuals_only = TRUE) // REDSHIFT EDIT - dummy.equipOutfit(/datum/outfit/job/assistant/consistent, visuals_only = TRUE)
dummy.dna.species.prepare_human_for_preview(dummy)

var/datum/universal_icon/dummy_icon = get_flat_uni_icon(dummy)
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion redshift/species/_species.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/species
/// The outfit to show in this species' preferences preview
var/datum/outfit/preview_outfit = /datum/outfit
var/datum/outfit/preview_outfit = /datum/outfit/job/assistant/consistent
/// Overrides the alpha of bodyparts and mutant parts
var/body_alpha = 255

Expand Down
24 changes: 16 additions & 8 deletions redshift/species/species_types/aquatic/aquatic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@
race = /datum/species/aquatic

/datum/species/aquatic
name = "\improper Persean"
plural_form = "Perseans"
name = "\improper Ordoht-like"
plural_form = "Ordoht-alikes"
id = SPECIES_AQUATIC
// preview_outfit =
inherent_traits = list(
TRAIT_MUTANT_COLORS,
)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_AQUATIC
mutant_organs = list(
/obj/item/organ/tail/ob = SPRITE_ACCESSORY_NONE,
/obj/item/organ/horns/ob = SPRITE_ACCESSORY_NONE,
/obj/item/organ/frills = SPRITE_ACCESSORY_NONE,
/obj/item/organ/spines = SPRITE_ACCESSORY_NONE,
)
mutantears = /obj/item/organ/ears/ob
mutanteyes = /obj/item/organ/eyes/aquatic
Expand Down Expand Up @@ -43,14 +45,20 @@
preview_mob.update_body(is_creating = TRUE)

/datum/species/aquatic/get_species_description()
return "Originating from a warm planet covered mosty in shallow oceans, Perseans are outstanding swimmers and are capable of breathing in both water and air."
return "Various humanoid species that have been modified into the general form of the Ordoht, seen as ideal for the conditions \
on New Gibraltar and other frontier worlds with large bodies of water."

/datum/species/aquatic/get_species_lore()
return list(
"It would be a proper good idea.",
"While increasingly rare to see the Ordoht anywhere outside of their core worlds, many of their features were seen as \
desirable when it comes to colonization and work on frontier worlds with large bodies of water.",

"To put \
something interesting.",
"Many species, especially Tizirans and Human frontiersmen undergo extensive modification, therapy, and training to \
better resemble their aquatic allies.",

"In this space.",
"It is often the case, however, that the descendants of these original modders don't have quite as much of an affinity for \
the sea as their ancestors.",

"This results in third or even second generation ordoht-likes seen in odd jobs around the system, like here hunting for \
Hark Crusoe's lost treasure.",
)
22 changes: 15 additions & 7 deletions redshift/species/species_types/avian/avian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,28 @@
preview_mob.dna.features[FEATURE_MUTANT_COLOR] = "#837d79"
preview_mob.dna.features[FEATURE_OB_SNOUT_COLOR] = "#252524"
preview_mob.dna.features[FEATURE_OB_SNOUT] = "Beak - Normal"
preview_mob.dna.species.mutant_organs[/obj/item/organ/snout/ob] = "Beak - Normal"
preview_mob.set_haircolor("#c7c4c2", update = FALSE)
preview_mob.set_hairstyle("Alcyoni - Rooster", update = TRUE)
preview_mob.update_body(is_creating = TRUE)
regenerate_organs(preview_mob)
preview_mob.update_body(TRUE)

/datum/species/avian/get_species_description()
return "Feathered avian type peoples coming from a homeworld with a troubled tectonic history, resulting in volcanic islands the size of small continents \
surrounded by deep oceans, making flat land a premium."
return "Various humanoid species that have been modified with avian-like feathery features to better occupy planets in Crusoe's Rest such \
as Truth and Accord."

/datum/species/avian/get_species_lore()
return list(
"It would be a proper good idea.",
"When searching for a viable solution for genetic modification of peoples of multiple species to best fit the climates of Truth and Accord, \
anything with fur was written off due to the logistical problems that introducing even more furred species onto a closed environment would \
introduce.",

"To put \
something interesting.",
"Drawing inspiration from other natural cold-weather life, avian-like feathers were chosen after observations of effective arctic \
birds of prey were brought to the table.",

"In this space.",
"Depending on the original species of the modder, they may look anywhere between an anthropomorphised arctic bird, to a feathered \
reptile.",

"While thriving in cold environments, variations in more tropical styles for New Gibraltar are also a common sight, though as more \
of a fashion statement than a practical need.",
)
24 changes: 14 additions & 10 deletions redshift/species/species_types/furries/furries.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
race = /datum/species/furries

/datum/species/furries
name = "\improper Nanthi"
plural_form = "Nanthi"
name = "\improper Carnivae"
plural_form = "Carnivae"
id = SPECIES_FURRIES
// preview_outfit =
inherent_traits = list(
Expand Down Expand Up @@ -40,22 +40,26 @@

/datum/species/furries/prepare_human_for_preview(mob/living/carbon/human/preview_mob)
preview_mob.dna.features[FEATURE_MUTANT_COLOR] = "#64564e"
preview_mob.dna.features[FEATURE_OB_SNOUT] = "Nanthi - Lynx"
preview_mob.dna.features[FEATURE_OB_SNOUT] = "Nanthi - Felinid"
preview_mob.dna.species.mutant_organs[/obj/item/organ/snout/ob] = "Nanthi - Felinid"
preview_mob.dna.features[FEATURE_OB_SNOUT_COLOR] = "#64564e"
preview_mob.dna.features[FEATURE_OB_EARS] = "Nanthi - Felinid"
preview_mob.dna.features[FEATURE_OB_EARS] = "Nanthi - Lynx"
preview_mob.dna.species.mutant_organs[/obj/item/organ/ears/ob] = "Nanthi - Lynx"
preview_mob.dna.features[FEATURE_OB_EARS_COLOR] = "#64564e"
preview_mob.set_haircolor("#92669b", update = FALSE)
preview_mob.set_hairstyle("Kajam", update = TRUE)
regenerate_organs(preview_mob)
preview_mob.update_body(is_creating = TRUE)

/datum/species/furries/get_species_description()
return "A furred people, usually sharing many features with earth's felidae, vulpes, and canidae life, often a mixture of the three. Their home planet resembles \
the countrysides of Earth's European continent."
return "The general classification of (as much as no individual member would like it to be true) distantly related species of \
mostly carnivorous furred humanoids such as Vulpkanin, Tajaran, or even simply heavily modified humanoids of other species."

/datum/species/furries/get_species_lore()
return list(
"It would be a proper good idea.",
"While differing heavily between the actual species representing, many features are similar between individual members.",

"To put \
something interesting.",
"Most have fur, a matching tail and ears, and generally fall under the features of those found in foxes, canines, or felines.",

"In this space.",
"Another common sight among many is the presence of doubled body features, between eyes, ears, tails, often even internal organs.",
)
19 changes: 13 additions & 6 deletions redshift/species/species_types/human/humans.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,28 @@
/datum/species/human/prepare_human_for_preview(mob/living/carbon/human/preview_mob)
preview_mob.skin_tone = "mixed1"
preview_mob.dna.features[FEATURE_OB_EARS] = "Solari - Wide Elf"
preview_mob.dna.species.mutant_organs[/obj/item/organ/ears/ob] = "Solari - Wide Elf"
preview_mob.dna.features[FEATURE_OB_EARS_COLOR] = "#a57a66"
preview_mob.set_haircolor("#2c2b2a", update = FALSE)
preview_mob.set_hairstyle("Chunky Twin Buns", update = TRUE)
regenerate_organs(preview_mob)
preview_mob.update_body(is_creating = TRUE)

/datum/species/human/get_species_description()
return "Humanity, coming from Earth as we know it, or rather, would have known it in the year 17th century. Early exposure to the technologies of the space-faring \
species they now call brothers has irrepairably changed the course of history."
return "Originating from Earth, spreading to many of the vast reaches of what now makes up the 4CA and then some after uplifting \
and the great migration. Thanks to genetic modification and the great variety of environments, humanity takes on an equally \
diverse number of forms."

/datum/species/human/get_species_lore()
return list(
"It would be a proper good idea.",
"Humanity as it was first discovered is unrecognizable to the average human in modern day.",

"To put \
something interesting.",
"With the spread of space-age healthcare, genetic modification, and simply the great variety of environments that humanity \
has decided to settle in, each individual member of the species may look completely different to any other member.",

"In this space.",
"While certainly not the only ones to heavily modify themselves to suit their environments or self image, humans are most likely \
to take it the furthest.",

"Copying features from the other species in the 4CA or even from their home, it's not uncommon to see a human having completely \
transformed themselves into another creature completely.",
)
29 changes: 19 additions & 10 deletions redshift/species/species_types/insects/insects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
race = /datum/species/insect

/datum/species/insect
name = "\improper Shedir"
plural_form = "Shedir"
name = "\improper Insectoid"
plural_form = "Insectoids"
id = SPECIES_INSECT
// preview_outfit =
inherent_traits = list(
TRAIT_MUTANT_COLORS,
)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
mutant_organs = list(
/obj/item/organ/snout/ob = SPRITE_ACCESSORY_NONE,
/obj/item/organ/tail/ob = SPRITE_ACCESSORY_NONE,
/obj/item/organ/horns/ob = SPRITE_ACCESSORY_NONE,
/obj/item/organ/wings/moth = SPRITE_ACCESSORY_NONE,
/obj/item/organ/antennae = SPRITE_ACCESSORY_NONE,
)
mutanteyes = /obj/item/organ/eyes/insect
mutantears = /obj/item/organ/ears/ob
Expand Down Expand Up @@ -41,22 +43,29 @@
/datum/species/insect/prepare_human_for_preview(mob/living/carbon/human/preview_mob)
preview_mob.dna.features[FEATURE_MUTANT_COLOR] = "#4c5050"
preview_mob.dna.features[FEATURE_OB_SNOUT] = "Insect - Itty-Bitty"
preview_mob.dna.species.mutant_organs[/obj/item/organ/snout/ob] = "Insect - Itty-Bitty"
preview_mob.dna.features[FEATURE_OB_SNOUT_COLOR] = "#353535"
preview_mob.dna.features[FEATURE_OB_EARS] = "Antennae - Straight"
preview_mob.dna.species.mutant_organs[/obj/item/organ/ears/ob] = "Antennae - Straight"
preview_mob.dna.features[FEATURE_OB_EARS_COLOR] = "#353535"
preview_mob.set_haircolor("#4b6675", update = FALSE)
preview_mob.set_hairstyle("Rows 2", update = TRUE)
regenerate_organs(preview_mob)
preview_mob.update_body(is_creating = TRUE)

/datum/species/insect/get_species_description()
return "Bipedal insectoids varying wildly in appearance between any few members. They hail from a world that, on the surface, looks barren and rocky with only \
a few hardy lichen surviving there. Beneath the surface, however, is an extensive network of caves and caverns that are home to life adapted to the dim \
tunnels, lit only by the many bioluminescent plants that call the caves their home."
return "Representing anything between the many Veniri around the system to other species that have modified themselves to be \
completely insectoid, the species is classified best by looking like a large bug of some kind."

/datum/species/insect/get_species_lore()
return list(
"It would be a proper good idea.",
"While not always a Veniri, almost always a Veniri.",

"To put \
something interesting.",
"Despite the common assumption that every single one looks like a especially large moth, they come in the shape of \
many different insects both known and exotic.",

"In this space.",
"Between every one you can find, however, a few features are always the same.",

"A chitinous body with an exoskeleton, as well as purple-colored blood due to the unique oxygen carrying compounds \
used in their biology.",
)
23 changes: 15 additions & 8 deletions redshift/species/species_types/reptile/reptile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
race = /datum/species/reptile

/datum/species/reptile
name = "\improper Cenerian"
plural_form = "Cenerians"
name = "\improper Tiziran"
plural_form = "Tizirans"
id = SPECIES_REPTILE
// preview_outfit =
inherent_traits = list(
TRAIT_MUTANT_COLORS,
)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE
mutant_organs = list(
/obj/item/organ/snout/ob = SPRITE_ACCESSORY_NONE,
/obj/item/organ/tail/ob = SPRITE_ACCESSORY_NONE,
/obj/item/organ/horns/ob = SPRITE_ACCESSORY_NONE,
/obj/item/organ/frills = SPRITE_ACCESSORY_NONE,
/obj/item/organ/spines = SPRITE_ACCESSORY_NONE,
)
mutantears = /obj/item/organ/ears/ob
exotic_bloodtype = /datum/blood_type/copper
Expand Down Expand Up @@ -42,20 +44,25 @@
preview_mob.dna.features[FEATURE_OB_SNOUT] = SPRITE_ACCESSORY_NONE
preview_mob.dna.features[FEATURE_MUTANT_COLOR] = "#5f9597"
preview_mob.dna.features[FEATURE_OB_HORNS] = "Lizard - Ram (Alt)"
preview_mob.dna.species.mutant_organs[/obj/item/organ/horns/ob] = "Lizard - Ram (Alt)"
preview_mob.dna.features[FEATURE_OB_HORNS_COLOR] = "#353535"
preview_mob.set_haircolor("#b9985a", update = FALSE)
preview_mob.set_hairstyle("Comet", update = TRUE)
regenerate_organs(preview_mob)
preview_mob.update_body(is_creating = TRUE)

/datum/species/reptile/get_species_description()
return "A reptile-like people originating from a hot world with an arid band around the equator that gives way to more temperate poles."
return "Bipedal reptiles that, excluding other species modified in a similar way, hail from the militaristic Talunan Empire outside of 4CA space."

/datum/species/reptile/get_species_lore()
return list(
"It would be a proper good idea.",
"While taking their looks after a great many type of reptile, much of the species looks like some form of snake or lizard if compared \
to Earth's biology.",

"To put \
something interesting.",
"Sexual dimorphism leads to large females dull in color, and smaller males painted like the rainbow. Being sequentially hermaphroditic \
and influenced heavily by their environment, a Tiziran may find themselves as either gender or anywhere inbetween multiple times in their life.",

"In this space.",
"Excepting disability, or having been raised outside of the reaches of clan Talunan, every Tiziran has served at least a few years in \
the clan's military. Such a thing is seen as a rite of passage, even if the most common positions to hold will involve zero fighting and take \
more of a civil service role."
)
56 changes: 0 additions & 56 deletions redshift/species/species_types/slimes/slimes.dm

This file was deleted.

Loading