Skip to content

Commit

Permalink
The Krisitik Species (#6062)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## For your consideration a Rodent Race
The Krisitik are a race of subterrianian murine aliens from the
Saggitarius Arm. Having been forced underground by the toxic and
radioactive surface of their homeworld they have spent a millenia
perfecting nuclear technology to power their massive underground cities.
With their government slowly turning away form their previous
isolationism and protectionism, the Krisitik are being seen more and
more in the wider galaxy including on Nanotrasen stations.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Krisitik are something I have been working on for a while and I tend to
use them as a springboard to develop further neat things further on.
These may include more plants for botany, additional subspecies, new
Cooking Recipes, special cargo only items, and other special equipment.

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: The Krisitik Species, may need a slight amount of balancing going
forward.
tweak: Squeakish Language Rework, hopefully it sounds slightly less
ridiculous now.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Shadow <[email protected]>
  • Loading branch information
CharlesWedge and Shadowtail117 authored Oct 18, 2023
1 parent 5bec137 commit ca4ef53
Show file tree
Hide file tree
Showing 14 changed files with 125 additions and 18 deletions.
3 changes: 2 additions & 1 deletion citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2936,12 +2936,12 @@
#include "code\modules\language\languages\species\adherent.dm"
#include "code\modules\language\languages\species\akula.dm"
#include "code\modules\language\languages\species\alraune.dm"
#include "code\modules\language\languages\species\altevian.dm"
#include "code\modules\language\languages\species\birdsong.dm"
#include "code\modules\language\languages\species\celestial.dm"
#include "code\modules\language\languages\species\diona.dm"
#include "code\modules\language\languages\species\human.dm"
#include "code\modules\language\languages\species\keisani.dm"
#include "code\modules\language\languages\species\krisitik.dm"
#include "code\modules\language\languages\species\moth.dm"
#include "code\modules\language\languages\species\naramadi.dm"
#include "code\modules\language\languages\species\phoronoid.dm"
Expand Down Expand Up @@ -4446,6 +4446,7 @@
#include "code\modules\species\station\standard\akula.dm"
#include "code\modules\species\station\standard\human.dm"
#include "code\modules\species\station\standard\human_subspecies.dm"
#include "code\modules\species\station\standard\krisitik.dm"
#include "code\modules\species\station\standard\moth.dm"
#include "code\modules\species\station\standard\naramadi.dm"
#include "code\modules\species\station\standard\nevrean.dm"
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/inventory/bodytypes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
#define BODYTYPE_XENOHYBRID "xenohybrid"
/// digitigrade unathi
#define BODYTYPE_UNATHI_DIGI "unathi-digi"
/// krisitik
#define BODYTYPE_KRISITIK "krisitik"

//! keep this number (count) up to date
#define BODYTYPES_TOTAL 19
Expand Down Expand Up @@ -112,6 +114,7 @@
#define BODYTYPE_STRING_PHORONOID "phoronoid"
#define BODYTYPE_STRING_WEREBEAST "werebeast"
#define BODYTYPE_STRING_XENOHYBRID "xenohybrid"
#define BODYTYPE_STRING_KRISITIK "krisitik" //Currently Unused until I can do Suit Sprites

/proc/bodytype_to_string(bodytype)
// todo: assoc list lookup
Expand Down Expand Up @@ -154,5 +157,7 @@
return BODYTYPE_STRING_WEREBEAST
if(BODYTYPE_XENOHYBRID)
return BODYTYPE_STRING_XENOHYBRID
if(BODYTYPE_KRISITIK)
return BODYTYPE_STRING_VULPKANIN //Borrowing Vulp Sprites until I can sprite all the space suits.
else
CRASH("unknown bodytype: [bodytype]")
4 changes: 2 additions & 2 deletions code/__DEFINES/languages/ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
#define LANGUAGE_ID_ADHERENT "adherent"
/// akula
#define LANGUAGE_ID_AKULA "akula"
/// altevians
#define LANGUAGE_ID_ALTEVIAN "altevian"
/// ????????
#define LANGUAGE_ID_BIRDSONG "birdsong"
/// aurils
Expand All @@ -45,6 +43,8 @@
#define LANGUAGE_ID_NARAMADI "naramadi"
/// phoronoids
#define LANGUAGE_ID_PHORONOID "phoronoid"
/// krisitik
#define LANGUAGE_ID_SQUEAKISH "squeakish"
/// shadekin
#define LANGUAGE_ID_SHADEKIN_HIVEMIND "shadekin_global"
/// skrell
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/species/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#define SPECIES_ID_HUMAN_GRAV "human_grav"
#define SPECIES_ID_HUMAN_SPACE "human_space"
#define SPECIES_ID_HUMAN_VAT "human_vat"
#define SPECIES_ID_KRISITIK "krisitik"
#define SPECIES_ID_MONKEY "monkey"
#define SPECIES_ID_MOTH "moth"
#define SPECIES_ID_MOTH_DARK "moth_dark"
Expand Down Expand Up @@ -95,6 +96,7 @@
#define SPECIES_HUMAN_GRAV "grav-adapted Human"
#define SPECIES_HUMAN_SPACER "space-adapted Human"
#define SPECIES_HUMAN_VATBORN "Vatborn"
#define SPECIES_KRISITIK "Krisitik"
#define SPECIES_MONKEY "Monkey"
#define SPECIES_MONKEY_AKULA "Sobaka"
#define SPECIES_MONKEY_NEVREAN "Sparra"
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/suit_storage/suit_cycler.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//Departments that the cycler can paint suits to look like.
var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Director","Head of Security", "No Change")
//Species that the suits can be configured to fit.
var/list/species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VOX, SPECIES_AURIL, SPECIES_DREMACHIR, SPECIES_APIDAEN)
var/list/species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VOX, SPECIES_AURIL, SPECIES_DREMACHIR, SPECIES_APIDAEN, SPECIES_KRISITIK)

var/target_department
var/target_species
Expand Down Expand Up @@ -252,7 +252,7 @@
//Clear the access reqs, disable the safeties, and open up all paintjobs.
to_chat(user, "<span class='danger'>You run the sequencer across the interface, corrupting the operating protocols.</span>")
departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Crowd Control","Emergency Medical Response","^%###^%$", "Charring", "No Change")
species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VOX, SPECIES_AURIL, SPECIES_DREMACHIR, SPECIES_APIDAEN)
species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VOX, SPECIES_AURIL, SPECIES_DREMACHIR, SPECIES_APIDAEN, SPECIES_KRISITIK)

emagged = 1
safeties = 0
Expand Down
18 changes: 18 additions & 0 deletions code/modules/catalogue/catalogue_data.dm
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,24 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
and as such many things about them have yet to be comprehensively studied."
value = CATALOGUER_REWARD_TRIVIAL

/datum/category_item/catalogue/fauna/krisitik
name = "Sapients - Krisitik"
desc = "Krisitik are a species of subterranean mammals from the planet of Murith. \
Their unstable genetics mean the species has a varied appearance, though they \
can generally be described as murine. Their unstable genetics also mean \
they are prone to cancers and lethal mutations, which is aggravated by the species' \
reliance on nuclear energy. \
<br><br>\
Their society is highly competitive, and the frequent disasters in their underground \
cities mean the species as a whole has a degree of paranoia far above average for \
most sapients, instinctively prepping for any kind of disaster. \
<br><br>\
Even before their discovery of FTL, the Krisitik had a very advanced society. \
Their discovery of FTL was likely delayed due to the subterranean nature of Krisitik \
society and the toxic atmosphere of their homeworld. This edge has meant the Krisitik \
have faired better as an independent species than other 'newcomers' to the galaxy. "
value = CATALOGUER_REWARD_TRIVIAL

/datum/category_item/catalogue/fauna/vox
name = "Sapients - Vox"
desc = "Probably the best known of these aliens are the Vox, a bird-like species \
Expand Down
4 changes: 4 additions & 0 deletions code/modules/hardsuits/rig_pieces.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
SPECIES_AURIL,
SPECIES_DREMACHIR,
SPECIES_HUMAN,
SPECIES_KRISITIK,
SPECIES_NEVREAN,
SPECIES_PHORONOID,
SPECIES_PROMETHEAN,
Expand Down Expand Up @@ -63,6 +64,7 @@
SPECIES_AURIL,
SPECIES_DREMACHIR,
SPECIES_HUMAN,
SPECIES_KRISITIK,
SPECIES_NEVREAN,
SPECIES_PHORONOID,
SPECIES_PROMETHEAN,
Expand Down Expand Up @@ -103,6 +105,7 @@
SPECIES_AURIL,
SPECIES_DREMACHIR,
SPECIES_HUMAN,
SPECIES_KRISITIK,
SPECIES_NEVREAN,
SPECIES_PHORONOID,
SPECIES_PROMETHEAN,
Expand Down Expand Up @@ -155,6 +158,7 @@
SPECIES_AURIL,
SPECIES_DREMACHIR,
SPECIES_HUMAN,
SPECIES_KRISITIK,
SPECIES_NEVREAN,
SPECIES_PHORONOID,
SPECIES_PROMETHEAN,
Expand Down
13 changes: 0 additions & 13 deletions code/modules/language/languages/species/altevian.dm

This file was deleted.

17 changes: 17 additions & 0 deletions code/modules/language/languages/species/krisitik.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/datum/language/squeakish
id = LANGUAGE_ID_SQUEAKISH
name = LANGUAGE_SQUEAKISH
translation_class = TRANSLATION_CLASS_DEFAULT_STANDARD_RACE
desc = "A language native to the Krisitik. It is composed of many squeakish whistles and nuzzles that is very hard to learn for non-native speakers. \
It has in recent times adopted words from Tyrmalin."
key = "E"
colour = "squeakish"
speech_verb = "squeaks"
whisper_verb = "squiks"
exclaim_verb = "squeaks loudly"
syllables = list ("sque", "uik", "squeak", "squee", "eak", "uek", "squik",
"squeek", "sq", "eek", "ee", "ek", "ak", "ueak", "squea", "tik",
"kris", "it", "rus", "gris", "mur", "ith", "vol", "voth", "nar",
"ik", "ine", "quol", "quee", "zre", "tch", "ol", "sk", "rat",
"arc", "cra", "kr", "ah", "sin", "si")
shorthand = "SQ"
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/human_species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,6 @@

/mob/living/carbon/human/adherent
species = /datum/species/adherent

/mob/living/carbon/human/krisitik
species = /datum/species/krisitik
70 changes: 70 additions & 0 deletions code/modules/species/station/standard/krisitik.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/datum/species/krisitik
uid = SPECIES_ID_KRISITIK
id = SPECIES_ID_KRISITIK
name = SPECIES_KRISITIK
name_plural = SPECIES_KRISITIK
default_bodytype = BODYTYPE_KRISITIK

icobase = 'icons/mob/species/krisitik/body.dmi'
deform = 'icons/mob/species/krisitik/body.dmi' // They don't have a proper one for some reason...
preview_icon = 'icons/mob/species/krisitik/preview.dmi'
husk_icon = 'icons/mob/species/krisitik/husk.dmi'

tail = "tail"
icobase_tail = 1

max_additional_languages = 3
name_language = LANGUAGE_ID_SQUEAKISH
intrinsic_languages = LANGUAGE_ID_SQUEAKISH

vision_innate = /datum/vision/baseline/species_tier_2

color_mult = 1

blurb = {"
Krisitik are a race of subterranean murine people from the Perseus Arm. Already significantly advanced
even before developing FTL, the Krisitik have exploded onto the galaxy using their mastery of nuclear technology
to bridge the gap between them and the galactic superpowers. The crowding in the massive underground\
cities of their toxic homeworld of Murith has led many Krisitik to emigrate to their colonies or towards the
corporate frontier. As their isolationist government becomes more open, this emigration is only increasing.

The Krisitik are highly varied people owing to their unstable genetics, which can result in lethal defects
if left untreated. They are a competitive, survivalist, and paranoid people known to stretch, bend, and
break the rules if it means being prepared for disasters to come, even if they are unlikely."}


// wikilink = ""
catalogue_data = list(/datum/category_item/catalogue/fauna/krisitik)


species_spawn_flags = SPECIES_SPAWN_CHARACTER
species_appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR

flesh_color = "#AFA59E"
base_color = "B2B2B2"

slowdown = -0.35

brute_mod = 1.1
burn_mod = 1.1
flash_mod = 1.5 //Cave creatures don't like bright lights
radiation_mod = 0.75 //Hardened Genes

gluttonous = 1

max_age = 100

unarmed_types = list(
/datum/unarmed_attack/stomp,
/datum/unarmed_attack/kick,
/datum/unarmed_attack/claws,
/datum/unarmed_attack/bite/sharp,
)

inherent_verbs = list(
/mob/living/proc/shred_limb,
/mob/living/carbon/human/proc/tie_hair,
/mob/living/carbon/human/proc/hide_horns,
/mob/living/carbon/human/proc/hide_wings,
/mob/living/carbon/human/proc/hide_tail,
)
Binary file added icons/mob/species/krisitik/body.dmi
Binary file not shown.
Binary file added icons/mob/species/krisitik/husk.dmi
Binary file not shown.
Binary file added icons/mob/species/krisitik/preview.dmi
Binary file not shown.

0 comments on commit ca4ef53

Please sign in to comment.