diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 0a2970f76794..ac906eb83dcb 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -2727,7 +2727,7 @@ GLOBAL_LIST_EMPTY(features_by_species) SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, SPECIES_PERK_ICON = "band-aid", SPECIES_PERK_NAME = "Brutal Weakness", - SPECIES_PERK_DESC = "[plural_form] are weak to brute damage.", + SPECIES_PERK_DESC = "[plural_form] are weak to bruising and brute damage.", )) if(brutemod < 1) @@ -2752,7 +2752,7 @@ GLOBAL_LIST_EMPTY(features_by_species) SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "shield-alt", SPECIES_PERK_NAME = "Fire Resilience", - SPECIES_PERK_DESC = "[plural_form] are resilient to flames, and burn damage.", + SPECIES_PERK_DESC = "[plural_form] are resilient to fire and burn damage.", )) // Shock damage @@ -2810,7 +2810,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(heatmod < 1/* || bodytemp_heat_damage_limit > BODYTEMP_HEAT_DAMAGE_LIMIT*/) to_add += list(list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "thermometer-empty", + SPECIES_PERK_ICON = "thermometer-full", SPECIES_PERK_NAME = "Heat Resilience", SPECIES_PERK_DESC = "[plural_form] are resilient to hotter environments.", )) @@ -2847,7 +2847,7 @@ GLOBAL_LIST_EMPTY(features_by_species) to_add += list(list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "tint-slash", - SPECIES_PERK_NAME = "Bloodletted", + SPECIES_PERK_NAME = "Bloodless", SPECIES_PERK_DESC = "[plural_form] do not have blood.", )) @@ -2897,14 +2897,14 @@ GLOBAL_LIST_EMPTY(features_by_species) if(TRAIT_POWERHUNGRY in inherent_traits) to_add += list(list( SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, - SPECIES_PERK_ICON = "charging-station", //would prefer battery-bolt, but it doesn't show up + SPECIES_PERK_ICON = "battery-4", //would prefer battery-bolt, but it doesn't show up SPECIES_PERK_NAME = "Power-Hungry", SPECIES_PERK_DESC = "[plural_form] run off electricity rather than food.", )) if(TRAIT_EASYDISMEMBER in inherent_traits) to_add += list(list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "user-times", + SPECIES_PERK_ICON = "user-minus", SPECIES_PERK_NAME = "Limbs Easily Dismembered", SPECIES_PERK_DESC = "[plural_form] limbs are not secured well, and as such they are easily dismembered.", )) @@ -2912,7 +2912,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(TRAIT_EASILY_WOUNDED in inherent_traits) to_add += list(list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "user-times", + SPECIES_PERK_ICON = "user-injured", SPECIES_PERK_NAME = "Easily Wounded", SPECIES_PERK_DESC = "[plural_form] skin is very weak and fragile. They are much easier to apply serious wounds to.", )) @@ -2936,7 +2936,7 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/create_pref_biotypes_perks() var/list/to_add = list() - if(inherent_biotypes & MOB_UNDEAD) + if((inherent_biotypes & MOB_UNDEAD) && (TRAIT_NOBREATH in inherent_traits)) // We check NOBREATH so plasmamen don't get this to_add += list(list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "skull", @@ -2954,6 +2954,14 @@ GLOBAL_LIST_EMPTY(features_by_species) However, this gives [plural_form] the ability to do self-maintenance with just simple tools.", )) + if(DIGITIGRADE in species_traits) // Intentionally vague as preterni have DIGITIGRADE, feel free to change this when that changes + to_add += list(list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "shoe-prints", + SPECIES_PERK_NAME = "Nonstandard Limbs", + SPECIES_PERK_DESC = "[plural_form] have oddly shaped legs, and cannot fit into most standard footwear. Footwraps may be worn instead.", + )) + return to_add /** @@ -2980,9 +2988,9 @@ GLOBAL_LIST_EMPTY(features_by_species) if(length(bonus_languages)) to_add += list(list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "comment", - SPECIES_PERK_NAME = "Native Speaker", - SPECIES_PERK_DESC = "Alongside [initial(common_language.name)], [plural_form] gain the ability to speak [english_list(bonus_languages)].", + SPECIES_PERK_ICON = "book", + SPECIES_PERK_NAME = "[english_list(bonus_languages)] Fluency", + SPECIES_PERK_DESC = "Alongside [initial(common_language.name)], [plural_form] can speak and understand [english_list(bonus_languages)].", )) qdel(temp_holder) diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm index 84a8a38094d7..ba41b82a4a23 100644 --- a/code/modules/mob/living/carbon/human/species_types/IPC.dm +++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm @@ -139,7 +139,44 @@ /datum/species/ipc/create_pref_unique_perks() var/list/to_add = list() - // TODO + to_add += list( + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "brain", + SPECIES_PERK_NAME = "Rerouted Consciousnes", + SPECIES_PERK_DESC = "IPCs have positronic brains located in their chest rather than their head. \ + They can survive decapitation, but revival needs special reactivation surgery done on the brain.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "wrench", + SPECIES_PERK_NAME = "Working Machine", + SPECIES_PERK_DESC = "IPCs are manufactured to be quick and cheap workers. \ + They use tools and items faster than most races.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, + SPECIES_PERK_ICON = "robot", + SPECIES_PERK_NAME = "Automata", + SPECIES_PERK_DESC = "IPCs are completely inorganic. \ + They boast complete immunity to toxins, cell damage, disease, husking, and have no need to breathe. \ + Their \"organs\" will not heal naturally however, and must be replaced if damaged.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "trash-alt", + SPECIES_PERK_NAME = "Random Access Memories", // RIP daft punk + SPECIES_PERK_DESC = "IPCs hold all recent memories in their RAM chips, which wipe automatically on death. \ + An IPC will never remember when or how it died, regardless of how long it's been dead." + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "dna", + SPECIES_PERK_NAME = "Missing Sequence", + SPECIES_PERK_DESC = "IPCs have no DNA or genetic sequence. \ + They can't be affected by genetic mutations, nor be cloned.", + ), + ) return to_add diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 1ea5e367b42f..11245cb17077 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -325,7 +325,7 @@ return features /datum/species/ethereal/get_species_description() - return "Ethereals are one of the two other spacefaring species encountered by the SIC. Strange slime-based humanoids that emit light based on their \ + return "Ethereals are one of the two other spacefaring species encountered by the SIC. Strange humanoids comprised of crystal and stardust that emit light based on their \ general health, ethereals are also well-known for their general benevolence and naivety. While not common within SIC space, they are still \ a relatively accepted species in its borders." @@ -358,21 +358,43 @@ to_add += list( list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "lightbulb", - SPECIES_PERK_NAME = "Disco Ball", - SPECIES_PERK_DESC = "Ethereals passively generate their own light.", + SPECIES_PERK_ICON = "sun", // May or may not be worse than lightbulb idk + SPECIES_PERK_NAME = "Living Star", + SPECIES_PERK_DESC = "Ethereals are naturally bioluminescent, emitting a constant source of light from their bodies. \ + The brightness of this light changes based on their energy level and health.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "heart-circle-bolt", + SPECIES_PERK_NAME = "Crystal Core", + SPECIES_PERK_DESC = "Ethereals have strange crystalline hearts that never decompose, and form a regenerative chrysalis around them 5 minutes after death. \ + Reviving through this intense process leaves crystal growths in and around the brain, leaving the host with permanent brain trauma.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "arrows-to-eye", + SPECIES_PERK_NAME = "Telescopic Orbits", // Literally the best thing you could call this + SPECIES_PERK_DESC = "Ethereals have a wider field of vision, letting them see one tile further in all directions. \ + (Things may look slightly smaller because of this).", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "lungs", + SPECIES_PERK_NAME = "Respirative Electrolysis", + SPECIES_PERK_DESC = "Ethereals have a network of conductive chambers in their lungs that convert any inhaled water vapor into hydrogen and oxygen.", ), list( SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, SPECIES_PERK_ICON = "bolt", - SPECIES_PERK_NAME = "Energy-Sponge", - SPECIES_PERK_DESC = "Ethereals can gain charge when absorbing certain kinds of energy or radiation.", + SPECIES_PERK_NAME = "Bioelectric", + SPECIES_PERK_DESC = "Ethereals can gain charge when absorbing certain kinds of energy or radiation. \ + Storing too much energy may lead to a violent electrical discharge.", ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "biohazard", - SPECIES_PERK_NAME = "Starving Artist", - SPECIES_PERK_DESC = "Ethereals take toxin damage while starving.", + SPECIES_PERK_ICON = "battery-quarter", + SPECIES_PERK_NAME = "Fizzling Hunger", + SPECIES_PERK_DESC = "Ethereals fizzle out without enough energy to fuel them, taking toxin damage until death.", ), ) diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index bb2ced3fb645..f55e0894f52e 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -140,18 +140,19 @@ if(CONFIG_GET(number/default_laws) == 0) // Default lawset is set to Asimov to_add += list(list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "robot", - SPECIES_PERK_NAME = "Asimov Superiority", - SPECIES_PERK_DESC = "The AI and their cyborgs are, by default, subservient only \ - to humans. As a human, silicons are required to both protect and obey you.", + SPECIES_PERK_ICON = "terminal", + SPECIES_PERK_NAME = "Asimov Priority", + SPECIES_PERK_DESC = "The AI and their cyborgs are, by default, subservient only to humans. \ + As a human, silicons are required to both protect and obey you.", )) if(CONFIG_GET(flag/enforce_human_authority)) to_add += list(list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "bullhorn", - SPECIES_PERK_NAME = "Chain of Command", - SPECIES_PERK_DESC = "Nanotrasen only recognizes humans for Captain and Head of Personel. In addition to this, humans get more than other species.", + SPECIES_PERK_ICON = "star-half-alt", + SPECIES_PERK_NAME = "Nanotrasen's Trusted", + SPECIES_PERK_DESC = "Humans are the only race Nanotrasen trusts to run their stations and bear the rank of Captain. \ + Per company policy, they may also work as any and all Heads of Staff without restrictions.", )) return to_add 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 7a676d6667e6..77f203704083 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -173,10 +173,19 @@ to_add += list(list( SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, - SPECIES_PERK_ICON = "thermometer-empty", - SPECIES_PERK_NAME = "Cold-blooded", - SPECIES_PERK_DESC = "Lizardpeople have difficulty regulating their body temperature, they're not quite as affected by the temperature itself though.", - )) + SPECIES_PERK_ICON = "thermometer-half", + SPECIES_PERK_NAME = "Cold-Blooded", + SPECUES_PERK_DESC = "Vuulen are cold-blooded, and have evolved to withstand extreme temperatures for longer than most. \ + They're also affected by temperature psychologically, becoming more awake and alert in heat, but grow tired and drowsy in the cold.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, + SPECIES_PERK_ICON = "commenting", + SPECIES_PERK_NAME = "Reptilian Ssspeech", + SPECIES_PERK_DESC = "Vuulen have a forked tongue, similar to that of a snake. \ + They have a tendency to hisss when ssspeaking.", + ), + ) return to_add diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 80a128644b82..a8b6a976a4e1 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -111,28 +111,28 @@ list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "feather-alt", - SPECIES_PERK_NAME = "Precious Wings", - SPECIES_PERK_DESC = "Moths can fly in pressurized, zero-g environments and safely land short falls using their wings.", + SPECIES_PERK_NAME = "Flutter-Wings", + SPECIES_PERK_DESC = "Ex'hau naturally have large, delicate wings. They can fly in pressurized, zero-g environments and safely land \ + short falls using them. Take care however, as they're easily burnt off.", ), list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "tshirt", - SPECIES_PERK_NAME = "Meal Plan", - SPECIES_PERK_DESC = "Moths can eat clothes for nourishment.", + SPECIES_PERK_ICON = "scroll", + SPECIES_PERK_NAME = "Silky Sustenance", + SPECIES_PERK_DESC = "Ex'hau are able to feed off proteins found in most fabrics, letting them eat cloth and most clothing for nourishment.", ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "fire", - SPECIES_PERK_NAME = "Ablazed Wings", - SPECIES_PERK_DESC = "Moth wings are fragile, and can be easily burnt off.", + SPECIES_PERK_ICON = "fa-solid fa-eye", + SPECIES_PERK_NAME = "Nocturnal Eyes", + SPECIES_PERK_DESC = "Ex'hau have very sensitive eyes. Welding may need more than one layer of protection, \ + and sunglasses won't shield them from flashes.", ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "sun", - SPECIES_PERK_NAME = "Bright Lights", - SPECIES_PERK_DESC = "Moths need an extra layer of flash protection to protect \ - themselves, such as against security officers or when welding. Welding \ - masks will work.", + SPECIES_PERK_ICON = "mosquito", + SPECIES_PERK_NAME = "Fluffy Pests", + SPECIES_PERK_DESC = "Ex'hau are very similar to insects genetically, and are hurt much more by fly swatters and insecticides.", ), ) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index acc4dde95a25..44fc11c0bf13 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -207,7 +207,7 @@ return BUTT_SPRITE_PLASMA /datum/species/plasmaman/get_species_description() - return "Reanimated skeletons of those who died in plasma fires, plasmamen are the first alien sapient beings to be \ + return "Reanimated skeletons of those who died in plasma fires, plasmamen were the first sapient alien beings to be \ discovered, even though they're mainly former humans. While horrifying, most manage to return to their previous position in society before their transformation." /datum/species/plasmaman/get_species_lore() @@ -247,47 +247,52 @@ to_add += list( list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "user-shield", - SPECIES_PERK_NAME = "Protected", - SPECIES_PERK_DESC = "Plasmamen are immune to radiation, poisons, and most diseases.", + SPECIES_PERK_ICON = "user-astronaut", + SPECIES_PERK_NAME = "The Suit", + SPECIES_PERK_DESC = "Plasmamen begin wearing an airtight envirosuit, which they are dependant on to stay alive. \ + Their envirohelm is also space-worthy, provides welding protection, and has a built-in headlamp.", ), list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "bone", - SPECIES_PERK_NAME = "Wound Resistance", - SPECIES_PERK_DESC = "Plasmamen have higher tolerance for damage that would wound others.", + SPECIES_PERK_ICON = "skull", + SPECIES_PERK_NAME = "Hazard-Born", + SPECIES_PERK_DESC = "Plasmamen are reborn in the plasmafires they died in. \ + They're completely immune to husking, starving, the cold, and most diseases.", ), list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "wind", - SPECIES_PERK_NAME = "Plasma Healing", - SPECIES_PERK_DESC = "Plasmamen can heal wounds by consuming plasma.", + SPECIES_PERK_ICON = "bone", + SPECIES_PERK_NAME = "Bones of Steel", + SPECIES_PERK_DESC = "Plasmamen have tough bones infused with solid plasma. \ + They only suffer fracture wounds, and are generally harder to wound.", ), list( - SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "hard-hat", - SPECIES_PERK_NAME = "Protective Helmet", - SPECIES_PERK_DESC = "Plasmamen's helmets provide them shielding from the flashes of welding, as well as an inbuilt flashlight.", + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "fire", + SPECIES_PERK_NAME = "Phlogiston", + SPECIES_PERK_DESC = "Plasmamen have a makeup of solid, volatile plasma. \ + Exposure to oxygen gas will ignite this plasma, instantly setting them ablaze.", ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "fire", - SPECIES_PERK_NAME = "Living Torch", - SPECIES_PERK_DESC = "Plasmamen instantly ignite when their body makes contact with oxygen.", + SPECIES_PERK_ICON = "lungs", + SPECIES_PERK_NAME = "Baroxuldium Breath", + SPECIES_PERK_DESC = "Plasmamen can breathe plasma gas safely, but oxygen is highly toxic. \ + They receive a tank that can last most of the shift on arrival, and have a spare in their emergency box", ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "wind", - SPECIES_PERK_NAME = "Plasma Breathing", - SPECIES_PERK_DESC = "Plasmamen must breathe plasma to survive. You receive a tank when you arrive.", + SPECIES_PERK_ICON = "heart-circle-exclamation", + SPECIES_PERK_NAME = "Heartless Husks", + SPECIES_PERK_DESC = "Plasmamen, since their violent rebirth, do not have hearts. \ + Combined with how they react to oxygen, surgery and revival may be difficult.", ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "briefcase-medical", - SPECIES_PERK_NAME = "Complex Biology", - SPECIES_PERK_DESC = "Plasmamen take specialized medical knowledge to be \ - treated. Do not expect speedy revival, if you are lucky enough to get \ - one at all.", + SPECIES_PERK_ICON = "dna", + SPECIES_PERK_NAME = "Charred Genome", + SPECIES_PERK_DESC = "Plasmaman DNA is too rigid and burnt to hold a genetic sequence, and can't be affect by genetic mutations at all. \ + Despite this, they can still be cloned.", ), ) diff --git a/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm b/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm index 6908e8c9577f..b31af6d9807e 100644 --- a/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm +++ b/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm @@ -94,13 +94,55 @@ /datum/species/polysmorph/create_pref_unique_perks() var/list/to_add = list() - // TODO - - return to_add - -/datum/species/polysmorph/create_pref_biotypes_perks() - var/list/to_add = list() - - // TODO + to_add += list( + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "running", + SPECIES_PERK_NAME = "Predator Genes", + SPECIES_PERK_DESC = "Polysmorphs keep a fraction of the agility found in their xenomorph ancestors. \ + Their movement speed and crawl speed are slightly faster than most races.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "low-vision", + SPECIES_PERK_NAME = "Darkvision", + SPECIES_PERK_DESC = "Polysmorphs have an advanced set of eyes hidden inside their domed head. \ + These eyes can provide infrared sight, highlighting any living thing in view even in darkness.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "lungs", + SPECIES_PERK_NAME = "Devolved Vessels", + SPECIES_PERK_DESC = "Polysmorphs have a set of plasma vessels, degraded and fused with human lungs through the spawning process. \ + This mutated organ lets polysmorphs breathe both plasma and oxygen safely, but is easily hurt from breathing in hot air.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "bone", + SPECIES_PERK_NAME = "Exoskeletal", + SPECIES_PERK_DESC = "Polysmorphs have a rigid exoskeleton lining their bodies, making them harder to wound.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "filter", + SPECIES_PERK_NAME = "Reckless Filtration", + SPECIES_PERK_DESC = "Polysmorphs have alien livers capable of filtering out toxins much faster than most races. \ + Despite this, it's not very tough, and takes more damage from processing too many toxins at once.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, + SPECIES_PERK_ICON = "commenting", + SPECIES_PERK_NAME = "Alien Sssssspeech", + SPECIES_PERK_DESC = "Polysmorphs have a mouthed tongue similar to xenomorphs, but without the teeth. \ + They have a tendency to hissssss when sssssspeaking.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "wrench", + SPECIES_PERK_NAME = "Indextrous", + SPECIES_PERK_DESC = "Polysmorphs have large claw-like fingers built for slicing rather than quick or precise motions. \ + They use tools and items a bit slower than most races.", + ), + ) return to_add diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferenceWindow.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferenceWindow.tsx index f4a6ae3e5fbe..da37813b4fd4 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferenceWindow.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferenceWindow.tsx @@ -77,7 +77,7 @@ export const CharacterPreferenceWindow = (props, context) => { return ( diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx index 9fd6b472df2e..817f31d74bad 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx @@ -12,8 +12,8 @@ import { FeatureChoicedServerData, FeatureValueInput } from "./preferences/featu import { filterMap, sortBy } from "common/collections"; import { useRandomToggleState } from "./useRandomToggleState"; -const CLOTHING_CELL_SIZE = 48; -const CLOTHING_SIDEBAR_ROWS = 9; +const CLOTHING_CELL_SIZE = 56; +const CLOTHING_SIDEBAR_ROWS = 11; const CLOTHING_SELECTION_CELL_SIZE = 48; const CLOTHING_SELECTION_WIDTH = 5.4; diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm index 59aefffef7f6..913d4cdf893c 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm @@ -313,7 +313,7 @@ on a divine monument known as the Mother Tree. The main continent was wiped barren of life save the Tree, \ until jars of blood crashed into it and spawned the few victors. The survivors formed the Gukdem Confederacy: \ a government tasked with preventing such an event from happening again through strict authoritarian policies. \ - They quickly butchered almost all remaining non-phytosians lifeforms on Muldova in order to to assimilate them, \ + They quickly butchered almost all remaining non-phytosians lifeforms on Muldova in order to assimilate them, \ enclosing the rest to ensure a steady supply of population.", "In the year 2511, drones of Sano-Waltfield Industries landing on Muldova alerted phytosians of the existence \ @@ -329,9 +329,9 @@ at worst; it is a rather unremarkable event, since they'll be back soon. Violent, often lethal sports are not uncommon and \ still remain popular among them today. Most notable is the phytosian's obsession with fire. Fire is both revered and \ feared, as incineration is one of the only ways for a phytosian to truly die; it destroysthe podseeds under them and \ - evaporates blood. It is a divine power, a destructive force, and an escape from the endless cycle of rebirth.", + evaporates blood. It is a divine power, a destructive force, and an escape from the endless cycle of rebirth.", - "Today, few embassies exist on Muldova, and anything shown to SIC denizens and representative is carefully \ + "Today, few embassies exist on Muldova, and anything shown to SIC denizens and representatives is carefully \ chosen and controlled. Cooperation and exchanges between the SIC and the Confederacy are almost inexistent. \ The only phytosians seen in SIC space are generally political opponents to the Confederacy or have come to \ observe the galaxy outside their system, intending on coming back to provide a full report. Phytosians \ @@ -342,16 +342,50 @@ /datum/species/pod/create_pref_unique_perks() var/list/to_add = list() - // TODO + to_add += list( + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "clover", // Looks a bit like a sun too + SPECIES_PERK_NAME = "Photosynthetic", + SPECIES_PERK_DESC = "Phytosians passively heal and gain nutrition when exposed to light. \ + This effect is doubled while processing sugar.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "lungs", + SPECIES_PERK_NAME = "Carbon Cycle", + SPECIES_PERK_DESC = "Phytosians can breathe both oxygen and CO2 safely.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "tree", + SPECIES_PERK_NAME = "Friend of the Flora", + SPECIES_PERK_DESC = "Phytosians are viewed by certain hostile plant creatures (such as killer tomatoes) as neutral, \ + and won't immediately be hostile toward them.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, + SPECIES_PERK_ICON = "flask", + SPECIES_PERK_NAME = "Botanical Biology", + SPECIES_PERK_DESC = "Phytosians are hurt by herbicides and affected by other chemicals that impact plant life.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "plant-wilt", + SPECIES_PERK_NAME = "Wilting", + SPECIES_PERK_DESC = "Phytosians lose nutrition in darkness, and will begin to wilt and die while starving. \ + This effect is tripled while processing sugar.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, + SPECIES_PERK_ICON = "walking", + SPECIES_PERK_NAME = "Lumbering Steps", + SPECIES_PERK_DESC = "Phytosians are slower than most races.", + ), + ) return to_add -/datum/species/pod/create_pref_biotypes_perks() - var/list/to_add = list() - - // TODO - - return to_add /* Podpeople subspecies: IVYMEN */ diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index cf06d4af83a6..a1b901b1f427 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -314,26 +314,50 @@ list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "cookie-bite", - SPECIES_PERK_NAME = "Stone eater", - SPECIES_PERK_DESC = "Preterni can eat ores to replenish their metal skin. All ores are not created equal.", + SPECIES_PERK_NAME = "Stone Eater", + SPECIES_PERK_DESC = "Preterni are fitted with grinders in their stomach, letting them eat and process ores to replenish their metal skin. \ + All ores are not created equal.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "wrench", + SPECIES_PERK_NAME = "Worker Drone", + SPECIES_PERK_DESC = "Preterni were designed to be quick and efficient workers. \ + They use tools and items faster than most races.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "low-vision", + SPECIES_PERK_NAME = "Augmented Sight", + SPECIES_PERK_DESC = "Preterni have a night vision lens they can toggle built into their eyes. \ + This lens will drain power while active.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "lungs", + SPECIES_PERK_NAME = "Nanovapor Filters", + SPECIES_PERK_DESC = "Preterni have bioengineered lungs that require little oxygen, and filter trace amounts of toxic gases from the air. \ + However, they're prone to being damaged from breathing in cold air.", ), list( SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, SPECIES_PERK_ICON = "flask", SPECIES_PERK_NAME = "Chemical Purge", - SPECIES_PERK_DESC = "Preterni will purge any foreign chemicals after a short time of them being in the blood stream.", + SPECIES_PERK_DESC = "Preterni have an elaborate system of filters for decontaminating their organic parts. \ + A percentage of all foreign chemicals in their bloodstream are purged every few seconds.", ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, - SPECIES_PERK_ICON = "droplet-slash", + SPECIES_PERK_ICON = "shower", SPECIES_PERK_NAME = "Keep Dry", - SPECIES_PERK_DESC = "Preterni have exposed circuitry under cracks in their body, if water gets in they will short, causing weakness in the limbs and burns.", + SPECIES_PERK_DESC = "Preterni have exposed circuitry under the cracks in their outer shell. \ + Contact with water will short their electronics, causing weakness in the limbs and burns.", ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, SPECIES_PERK_ICON = "droplet-slash", SPECIES_PERK_NAME = "Metal Marrow", - SPECIES_PERK_DESC = "Preterni have solid metal bones with no internal marrow. Their body will not create blood to replace any lost.", + SPECIES_PERK_DESC = "Preterni have solid metal bones with no internal marrow. Their body will not create blood to replace any lost." ), )