From 1e62da5424a11a124c51082370af5f4a08914129 Mon Sep 17 00:00:00 2001
From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com>
Date: Fri, 5 Apr 2024 15:34:39 +0300
Subject: [PATCH] Unapologetic Teshari Buffs Vol. 1 (#2748)

* the second most powerful pr in the world

* oops lol

* oh nyo

* holy fuck

yeah goddamn

* wew

* no message

* okay last one

* THE WIND IS PUSHING MEEEEE INTO THE CLOUDS AGAIN I FEEL THE BLOOD IN MY VEINS

* then hollywood jack told the doctors 'you've got to retrieve him!'

* wew

* there we go

* Update modular_nova/modules/teshari/code/schechi.dm

---------

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
---
 code/datums/mutations/body.dm                 |   7 +-
 code/datums/quirks/positive_quirks/settler.dm |   5 +-
 code/game/objects/structures/tables_racks.dm  |   2 +-
 .../master_files/icons/hud/actions.dmi        | Bin 367 -> 1735 bytes
 .../master_files/icons/misc/language.dmi      | Bin 4484 -> 4476 bytes
 .../bodyparts/code/teshari_bodyparts.dm       |   2 +
 modular_nova/modules/organs/code/ears.dm      |  72 ++++++++++++++++++
 modular_nova/modules/teshari/code/_teshari.dm |  12 ++-
 modular_nova/modules/teshari/code/schechi.dm  |   6 +-
 tgstation.dme                                 |   1 +
 10 files changed, 98 insertions(+), 9 deletions(-)
 create mode 100644 modular_nova/modules/organs/code/ears.dm

diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index 940840e7e45..e93d0a5ddf7 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -120,8 +120,8 @@
 	if(..())
 		return
 	// NOVA EDIT BEGIN
-	if(owner.dna.features["body_size"] < 1)
-		to_chat(owner, "You feel your body shrinking even further, but your organs aren't! Uh oh!")
+	if(owner.dna.features["body_size"] < 1 || isteshari(owner))
+		to_chat(owner, "You feel your body try to shrink, but your organs don't! Uh oh!")
 		owner.adjustBruteLoss(25)
 		return
 	// NOVA EDIT END
@@ -132,9 +132,8 @@
 	if(..())
 		return
 	// NOVA EDIT BEGIN
-	if(owner.dna.features["body_size"] < 1)
+	if(owner.dna.features["body_size"] < 1 || isteshari(owner))
 		to_chat(owner, "You feel relief as your organs cease to strain against your insides.")
-		REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION)
 		return
 	// NOVA EDIT END
 	REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION)
diff --git a/code/datums/quirks/positive_quirks/settler.dm b/code/datums/quirks/positive_quirks/settler.dm
index 81402c050cd..3bc5b2c64f6 100644
--- a/code/datums/quirks/positive_quirks/settler.dm
+++ b/code/datums/quirks/positive_quirks/settler.dm
@@ -19,7 +19,10 @@
 	give_item_to_holder(/obj/item/storage/box/papersack/wheat, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS))
 	give_item_to_holder(/obj/item/storage/toolbox/fishing/small, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS))
 	var/mob/living/carbon/human/human_quirkholder = quirk_holder
-	human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST)
+	//NOVA EDIT BEGIN - This is so Teshari don't get the height decrease.
+	if(!isteshari(human_quirkholder))
+		human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST)
+	//NOVA EDIT END
 	human_quirkholder.add_movespeed_modifier(/datum/movespeed_modifier/settler)
 	human_quirkholder.physiology.hunger_mod *= 0.5 //good for you, shortass, you don't get hungry nearly as often
 
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 997d23c4139..74c146f3f2b 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -452,7 +452,7 @@
 		check_break(M)
 
 /obj/structure/table/glass/proc/check_break(mob/living/M)
-	if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND))
+	if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND) && (!isteshari(M))) //NOVA EDIT ADDITION - Allows Teshari to climb on glassies safely.
 		table_shatter(M)
 
 /obj/structure/table/glass/proc/table_shatter(mob/living/victim)
diff --git a/modular_nova/master_files/icons/hud/actions.dmi b/modular_nova/master_files/icons/hud/actions.dmi
index 32da90c1cf85692e1f69c60107f0bf4a80135f0b..ff81273f7df7305c4c35391565968e5bf0dfd6cc 100644
GIT binary patch
literal 1735
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

literal 367
zcmV-#0g(QQP)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP50000OP)t-sz`(#6
z948YL9uEx~o~yQBXNE>YXv5Ulo%ST600001bW%=J06^y0W&i*HY<g5!bVOxyV{&P5
zbZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)Cl
zAe`co#FA7XQ>i>Z2dE`8FI9<)GbOXA7$|1Q#hF%=n41b=D=WDAxqyuZ0Kxwo=H6HR
zn*aa+jY&j7R49?f&@l?bFboCIPn5W;m7YLuvkR01WXkNJ2gnk-_Wn}?g~)c-Lbd7f
zC6IvsRBVAcw!r)aRq6vpC?%0f(jjfCV;<{8%qfi~9udBo8KjsoHB%{Ou4JU0gGAB;
z?k7x<GASJTyu*O!375Pzup-RB!!LSaSb)W$#}0&C{$&G(vJd!Sy#YNd4#*mWnIixI
N002ovPDHLkV1jATluQ5s

diff --git a/modular_nova/master_files/icons/misc/language.dmi b/modular_nova/master_files/icons/misc/language.dmi
index 1e287eca0202266a99350613f7ddaefc048bc752..5ece55bc6f3a8eb04d491578829367437e741830 100644
GIT binary patch
delta 4351
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

delta 4359
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
BMcx1a

diff --git a/modular_nova/modules/bodyparts/code/teshari_bodyparts.dm b/modular_nova/modules/bodyparts/code/teshari_bodyparts.dm
index b816f59867f..a03440623ee 100644
--- a/modular_nova/modules/bodyparts/code/teshari_bodyparts.dm
+++ b/modular_nova/modules/bodyparts/code/teshari_bodyparts.dm
@@ -112,6 +112,7 @@
 	base_limb_id = SPECIES_TESHARI
 	brute_modifier = TESHARI_BRUTE_MODIFIER
 	burn_modifier = TESHARI_BURN_MODIFIER
+	speed_modifier = -0.1
 
 /obj/item/bodypart/leg/right/digitigrade/teshari
 	icon_greyscale = BODYPART_ICON_TESHARI
@@ -119,6 +120,7 @@
 	base_limb_id = SPECIES_TESHARI
 	brute_modifier = TESHARI_BRUTE_MODIFIER
 	burn_modifier = TESHARI_BURN_MODIFIER
+	speed_modifier = -0.1
 
 #undef TESHARI_PUNCH_LOW
 #undef TESHARI_PUNCH_HIGH
diff --git a/modular_nova/modules/organs/code/ears.dm b/modular_nova/modules/organs/code/ears.dm
new file mode 100644
index 00000000000..4db93f0ddd7
--- /dev/null
+++ b/modular_nova/modules/organs/code/ears.dm
@@ -0,0 +1,72 @@
+/obj/item/organ/internal/ears/teshari
+	name = "teshari ears"
+	desc = "A set of four long rabbit-like ears, a Teshari's main tool while hunting. Naturally extremely sensitive to loud sounds."
+	damage_multiplier = 1.5
+	actions_types = list(/datum/action/cooldown/spell/teshari_hearing)
+
+/obj/item/organ/internal/ears/teshari/on_mob_remove(mob/living/carbon/ear_owner)
+	. = ..()
+	REMOVE_TRAIT(ear_owner, TRAIT_GOOD_HEARING, ORGAN_TRAIT)
+
+/datum/action/cooldown/spell/teshari_hearing
+	name = "Toggle Sensitive Hearing"
+	desc = "Perk up your ears to listen for quiet sounds, useful for picking up whispering."
+	button_icon = 'modular_nova/master_files/icons/hud/actions.dmi'
+	button_icon_state = "echolocation_off"
+	background_icon_state = "bg_alien"
+	overlay_icon_state = "bg_alien_border"
+
+	cooldown_time = 1 SECONDS
+	spell_requirements = NONE
+
+/datum/action/cooldown/spell/teshari_hearing/proc/update_button_state(new_state) //This makes it so that the button icon changes dynamically based on ears being up or not.
+	button_icon_state = new_state
+	owner.update_action_buttons()
+
+/datum/action/cooldown/spell/teshari_hearing/Remove(mob/living/remove_from)
+	REMOVE_TRAIT(remove_from, TRAIT_GOOD_HEARING, ORGAN_TRAIT)
+	remove_from.update_sight()
+	return ..()
+
+/datum/action/cooldown/spell/teshari_hearing/cast(list/targets, mob/living/carbon/human/user = usr)
+	. = ..()
+
+	if(HAS_TRAIT(user, TRAIT_GOOD_HEARING))
+		teshari_hearing_deactivate(user)
+		return
+
+	user.apply_status_effect(/datum/status_effect/teshari_hearing)
+	user.visible_message(span_notice("[user], pricks up [user.p_their()] four ears, each twitching intently!"), span_notice("You perk up all four of your ears, hunting for even the quietest sounds."))
+	update_button_state("echolocation_on")
+
+	var/obj/item/organ/internal/ears/ears = user.get_organ_slot(ORGAN_SLOT_EARS)
+	if(ears)
+		ears.damage_multiplier = 3
+
+/datum/action/cooldown/spell/teshari_hearing/proc/teshari_hearing_deactivate(mob/living/carbon/human/user) //Called when you activate it again after casting the ability-- turning them off, so to say.
+	if(!HAS_TRAIT_FROM(user, TRAIT_GOOD_HEARING, ORGAN_TRAIT))
+		return
+
+	user.remove_status_effect(/datum/status_effect/teshari_hearing)
+	user.visible_message(span_notice("[user] drops [user.p_their()] ears down a bit, no longer listening as closely."), span_notice("You drop your ears down, no longer paying close attention."))
+	update_button_state("echolocation_off")
+
+	var/obj/item/organ/internal/ears/ears = user.get_organ_slot(ORGAN_SLOT_EARS)
+	if(ears)
+		ears.damage_multiplier = 1.5
+
+/datum/status_effect/teshari_hearing
+	id = "teshari_hearing"
+	alert_type = null
+	status_type = STATUS_EFFECT_UNIQUE
+
+/datum/status_effect/teshari_hearing/on_apply()
+	ADD_TRAIT(owner, TRAIT_GOOD_HEARING, ORGAN_TRAIT)
+	return ..()
+
+/datum/status_effect/teshari_hearing/on_remove()
+	REMOVE_TRAIT(owner, TRAIT_GOOD_HEARING, ORGAN_TRAIT)
+	return ..()
+
+/datum/status_effect/teshari_hearing/get_examine_text()
+	return span_notice("[owner.p_They()] [owner.p_have()] [owner.p_their()] ears perked up, listening closely to whisper-quiet sounds.")
diff --git a/modular_nova/modules/teshari/code/_teshari.dm b/modular_nova/modules/teshari/code/_teshari.dm
index 27a8625b748..caf52ae6ae6 100644
--- a/modular_nova/modules/teshari/code/_teshari.dm
+++ b/modular_nova/modules/teshari/code/_teshari.dm
@@ -39,6 +39,7 @@
 	bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT + TESHARI_TEMP_OFFSET)
 	bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT + TESHARI_TEMP_OFFSET)
 	species_language_holder = /datum/language_holder/teshari
+	mutantears = /obj/item/organ/internal/ears/teshari
 	body_size_restricted = TRUE
 	bodypart_overrides = list(
 		BODY_ZONE_HEAD = /obj/item/bodypart/head/mutant/teshari,
@@ -57,7 +58,7 @@
 	)
 
 /obj/item/organ/internal/tongue/teshari
-	liked_foodtypes = MEAT
+	liked_foodtypes = MEAT | GORE | RAW
 	disliked_foodtypes = GROSS | GRAIN
 
 /datum/species/teshari/random_name(gender, unique, lastname)
@@ -80,3 +81,12 @@
 	tesh.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Teshari (Default)", MUTANT_INDEX_COLOR_LIST = list(base_color, base_color, ear_color))
 	regenerate_organs(tesh, src, visual_only = TRUE)
 	tesh.update_body(TRUE)
+
+/datum/species/teshari/on_species_gain(mob/living/carbon/human/new_teshari, datum/species/old_species, pref_load)
+	. = ..()
+	passtable_on(new_teshari, SPECIES_TRAIT)
+
+/datum/species/teshari/on_species_loss(mob/living/carbon/C, datum/species/new_species, pref_load)
+	. = ..()
+	passtable_off(C, SPECIES_TRAIT)
+
diff --git a/modular_nova/modules/teshari/code/schechi.dm b/modular_nova/modules/teshari/code/schechi.dm
index e049738f639..ed930dbc9cc 100644
--- a/modular_nova/modules/teshari/code/schechi.dm
+++ b/modular_nova/modules/teshari/code/schechi.dm
@@ -1,12 +1,14 @@
 /datum/language/schechi
 	name = "Schechi"
-	desc = "The common language of the Teshari, and later adapted by many other avian species, consisting of miscellaneous chirps."
+	desc = "The very structurally loose creole tongue of the Teshari, host to hundreds of dialects almost different enough to resemble their own languages. \
+	Originally developed on Sirisai, Schechi has made its way across the Teshari diaspora as a commonly agreed upon way for entirely different packs to communicate."
 	key = "F"
 	space_chance = 40
 	syllables = list(
 		"i", "ii", "si", "aci", "hi", "ni", "li", "schi", "tari",
 		"e", "she", "re", "me", "ne",  "te", "se", "le", "ai",
-		"a", "ra", "ca", "scha", "tara", "sa", "la", "na",
+		"a", "ra", "ca", "scha", "tara", "sa", "la", "na", "ce",
+		"re", "se", "shi", "ti", "le", "la", "lu", "tu", "shu",
 	)
 	icon = 'modular_nova/master_files/icons/misc/language.dmi'
 	icon_state = "schechi"
diff --git a/tgstation.dme b/tgstation.dme
index 395ef32c531..0f3a7a8390c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -7945,6 +7945,7 @@
 #include "modular_nova\modules\opposing_force\code\equipment\modsuit.dm"
 #include "modular_nova\modules\opposing_force\code\equipment\spells.dm"
 #include "modular_nova\modules\opposing_force\code\equipment\uplink.dm"
+#include "modular_nova\modules\organs\code\ears.dm"
 #include "modular_nova\modules\organs\code\heart.dm"
 #include "modular_nova\modules\organs\code\liver.dm"
 #include "modular_nova\modules\organs\code\lungs.dm"