From 256ecd0c16ad26b34f217501dd8299159874a50e Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Wed, 16 Dec 2020 14:54:34 -0500 Subject: [PATCH] Kidan Rebalance (#13203) * Kidan mineral * kidan can wear glasses * More hunger and tox --- code/modules/clothing/clothing.dm | 2 +- code/modules/mob/living/carbon/human/emote.dm | 8 ++++---- code/modules/mob/living/carbon/human/species/kidan.dm | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 0f6548cae36..6a9dd763a05 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -212,7 +212,7 @@ strip_delay = 20 // but seperated to allow items to protect but not impair vision, like space helmets put_on_delay = 25 resistance_flags = NONE - species_restricted = list("exclude","Kidan") + /* SEE_SELF // can see self, no matter what SEE_MOBS // can see all mobs, no matter what diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 0bee396cd89..c434ecc2694 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -85,13 +85,13 @@ if("clack", "clacks") if(iskidan(src)) //Only Kidan can clack and rightfully so. - on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm' + on_CD = handle_emote_CD(30) //proc located in code\modules\mob\emote.dm' else //Everyone else fails, skip the emote attempt return if("click", "clicks") if(iskidan(src)) //Only Kidan can click and rightfully so. - on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm' + on_CD = handle_emote_CD(30) //proc located in code\modules\mob\emote.dm' else //Everyone else fails, skip the emote attempt return @@ -209,14 +209,14 @@ if("clack", "clacks") var/M = handle_emote_param(param) - + mineral_scan_pulse(get_turf(src), range = world.view) message = "[src] clacks [p_their()] mandibles[M ? " at [M]" : ""]." playsound(loc, 'sound/effects/Kidanclack.ogg', 50, 1, frequency = get_age_pitch()) //Credit to DrMinky (freesound.org) for the sound. m_type = 2 if("click", "clicks") var/M = handle_emote_param(param) - + mineral_scan_pulse(get_turf(src), range = world.view) message = "[src] clicks [p_their()] mandibles[M ? " at [M]" : ""]." playsound(loc, 'sound/effects/Kidanclack2.ogg', 50, 1, frequency = get_age_pitch()) //Credit to DrMinky (freesound.org) for the sound. m_type = 2 diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm index d5ba45fba03..f212eaa31b9 100644 --- a/code/modules/mob/living/carbon/human/species/kidan.dm +++ b/code/modules/mob/living/carbon/human/species/kidan.dm @@ -7,6 +7,8 @@ unarmed_type = /datum/unarmed_attack/claws brute_mod = 0.8 + hunger_drain = 0.15 + tox_mod = 1.7 species_traits = list(IS_WHITELISTED) clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS