Skip to content

Commit

Permalink
Merge pull request #11 from Starfly-13/Unathi-Mode
Browse files Browse the repository at this point in the history
UNATHI (Part One)
Goodbye Sarathi, hello Unathi!
What's this? There's something else in here -- stay tuned for the Yeosa'Unathi in Part Two!
  • Loading branch information
lectronyx authored Dec 15, 2023
2 parents b7dc48d + edffa49 commit 449698a
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 37 deletions.
30 changes: 28 additions & 2 deletions code/modules/language/draconic.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/language/draconic
name = "Kalixcian Common"
desc = "The most prevalent language to come out of Kalixcis, and generally understood by all those native to it."
name = "Sinta'Unathi"
desc = "The most prevalent language to come out of Moghes, composed of sibilant hisses and rattles."
speech_verb = "hisses"
ask_verb = "hisses"
exclaim_verb = "roars"
Expand All @@ -19,3 +19,29 @@
)
icon_state = "lizard"
default_priority = 90

/datum/language/yeosa
name = "Yeosa'Unathi"
desc = "A moghesan language consisting of spoken words and gestures, used by those who live near the shore. The rarity of this language outside of its native region and its prominence within only cause further obscurity of Yeosa culture."
speech_verb = "hisses"
ask_verb = "rattles"
exclaim_verb = "barks"
sing_verb = "sings"
key = "O"
flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding
space_chance = 40
syllables = list(
"azs","zis","zau","azua","skiu","zuakz","izo","aei","ki","kut","zo",
"ozs","siz","gau","uzua","sgyu","suags","ogh","eya","ghi","gut","gho",
"ga", "ag", "ge", "eg", "gi", "ig", "go", "og", "gu", "ug", "gs", "sg",
"za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz",
"ha", "ah", "he", "eh", "hi", "ih", "ho", "oh", "hu", "uh", "hs", "sh",
"la", "al", "le", "el", "li", "il", "lo", "ol", "lu", "ul", "ls", "sl",
"ka", "ak", "ke", "ek", "ki", "ik", "ko", "ok", "ku", "uk", "ks", "sk",
"sa", "as", "se", "es", "si", "is", "so", "os", "su", "us", "ss", "ss",
"ra", "ar", "re", "er", "ri", "ir", "ro", "or", "ru", "ur", "rs", "sr",
"a", "a", "e", "e", "i", "i", "o", "o", "u", "u", "s", "s"
)
icon_state = "lizard"
default_priority = 90

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Sarathi Mutantparts
//Unathi Mutantparts

//Start markings

Expand Down
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 Sarathi"
name = "\improper Unathi"
id = SPECIES_LIZARD
default_color = "00FF00"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,SCLERA,EMOTE_OVERLAY,MUTCOLORS_SECONDARY)
Expand All @@ -18,7 +18,7 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
skinned_type = /obj/item/stack/sheet/animalhide/lizard
exotic_bloodtype = "L"
disliked_food = GRAIN | DAIRY | CLOTH | GROSS
disliked_food = GRAIN | CLOTH | GROSS
liked_food = GORE | MEAT
inert_mutation = FIREBREATH
deathsound = 'sound/voice/lizard/deathsound.ogg'
Expand Down Expand Up @@ -48,7 +48,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 Sarathi are a cold-blooded reptilian species originating from the planet Kalixcis, where they evolved alongside the Elzuosa. Kalixcian culture places no importance on blood-bonds, and those from it tend to consider their family anyone they are sufficiently close to, and choose their own names."
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."

ass_image = 'icons/ass/asslizard.png'
var/datum/action/innate/liz_lighter/internal_lighter
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/reagents/other_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@
process_flags = ORGANIC | SYNTHETIC

/datum/reagent/mutationtoxin/lizard
name = "Sarathi Mutation Toxin"
name = "Unathi Mutation Toxin"
description = "A lizarding toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/lizard
Expand Down
4 changes: 2 additions & 2 deletions code/modules/research/nanites/nanite_programs/sensor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@

var/list/static/allowed_species = list(
"Human" = /datum/species/human,
"Sarathi" = /datum/species/lizard,
"Moth" = /datum/species/moth,
"Unathi" = /datum/species/lizard,
"Nian" = /datum/species/moth,
"Elzuose" = /datum/species/ethereal,
"Pod" = /datum/species/pod,
"Fly" = /datum/species/fly,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/surgery/organs/eyes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
var/tint = 0
var/eye_color = "" //set to a hex code to override a mob's eye color
var/eye_icon_state = "eyes"
var/sclera_color = "e8e8e8" //a hex color, in case some species, like sarathi have different sclera color
var/sclera_color = "e8e8e8" //a hex color, in case some species, like unathi have different sclera color
var/sclera_icon_state = "eyes_sclera" //sclera is the white part of the eye
var/old_eye_color = "fff"
var/flash_protect = FLASH_PROTECTION_NONE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/surgery/organs/tails.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
H.update_body()

/obj/item/organ/tail/lizard
name = "\improper Sarathi tail"
desc = "A severed Sarathi's tail. Can't they regrow these...?"
name = "\improper Unathi tail"
desc = "A severed Unathi's tail. Can they regrow these...?"
icon_state = "severedlizard"
color = "#116611"
tail_type = "Smooth"
Expand Down
17 changes: 0 additions & 17 deletions html/changelogs/AutoChangeLog-pr-2395.yml

This file was deleted.

8 changes: 0 additions & 8 deletions html/changelogs/AutoChangeLog-pr-2549.yml

This file was deleted.

22 changes: 22 additions & 0 deletions html/changelogs/archive/2023-12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,25 @@
- rscadd: Sarathi tails now use secondary colors.
- rscadd: Added "Cracks" body marking for Sarathi
- rscdel: Removed dark tiger, light tiger, and spike Sarathi tails.
2023-12-13:
MarkSuckerberg:
- tweak: Round end now shows the ship you spawned on when possible instead of just
the sector name
- tweak: Slightly moves around the statpanel info to emphasise LST
- bugfix: Round time should no longer act strange when midnight passes
- bugfix: Respawns should no longer be delayed 24h when done over midnight
Zonespace27, Ryll-Ryll, MeeMOfCourse:
- tweak: Admins can now spawn an unarmed horde of interns in addition to the old
armed horde
- tweak: Admins can toggle name randomization for ERT's, as well as if they'd like
to be spawned in the briefing room at the time of creation
- tweak: Admins can now force ERT's to pick the leader role from the most experienced
candidates in terms of playtime
- tweak: Menus like Create Response Team and Create Portal Storm now toggle boolean
options when clicked, rather than open a popup window to select one of the two
options
- refactor: Centcom Officials are now a full subtype of ERT, rather than being a
separate antagonist type with duplicated functionality
- admin: ERTs can now have a custom shuttle that they can spawn on, on a toggle
while creating said ERT.
- admin: Shiptest-Specific ERTs, and respective files.

0 comments on commit 449698a

Please sign in to comment.