From 91e177e636365956fb86af50b5a134d3eac70998 Mon Sep 17 00:00:00 2001 From: SeepingVisage <160535199+SeepingVisage@users.noreply.github.com> Date: Thu, 9 Jan 2025 23:57:38 -0500 Subject: [PATCH] re-adds the kitty purr tongue from oldcode currently just has this as the default tongue for felinids. i have to figure out how to make it selectable from roundstart --- GainStation13/code/datums/accents.dm | 9 +++++++++ GainStation13/code/modules/surgery/organs/tongue.dm | 8 ++++++++ .../mob/living/carbon/human/species_types/felinid.dm | 1 + tgstation.dme | 2 ++ 4 files changed, 20 insertions(+) create mode 100644 GainStation13/code/datums/accents.dm create mode 100644 GainStation13/code/modules/surgery/organs/tongue.dm diff --git a/GainStation13/code/datums/accents.dm b/GainStation13/code/datums/accents.dm new file mode 100644 index 0000000000..939af0e50e --- /dev/null +++ b/GainStation13/code/datums/accents.dm @@ -0,0 +1,9 @@ +/datum/accent/kitty/modify_speech(list/speech_args) + var/message = speech_args[SPEECH_MESSAGE] + var/static/regex/taja_purr = new("r+", "g") + var/static/regex/taja_puRR = new("R+", "g") + if(message[1] != "*") + message = taja_purr.Replace(message, "rrr") + message = taja_puRR.Replace(message, "Rrr") + speech_args[SPEECH_MESSAGE] = message + return speech_args diff --git a/GainStation13/code/modules/surgery/organs/tongue.dm b/GainStation13/code/modules/surgery/organs/tongue.dm new file mode 100644 index 0000000000..db682dd6f1 --- /dev/null +++ b/GainStation13/code/modules/surgery/organs/tongue.dm @@ -0,0 +1,8 @@ +/obj/item/organ/tongue/kitty + name = "barbed tongue" + desc = "A thin and prickled on top tongue, common among cats" + icon_state = "tonguenormal" + say_mod = "mrowls" + taste_sensitivity = 15 //Tastes like normal + maxHealth = 60 //And so has health like normal + initial_accents = list(/datum/accent/kitty) diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index beebbb1dfd..450db6cb6f 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -8,6 +8,7 @@ mutantears = /obj/item/organ/ears/cat mutanttail = /obj/item/organ/tail/cat + mutanttongue = /obj/item/organ/tongue/kitty tail_type = "mam_tail" wagging_type = "mam_waggingtail" diff --git a/tgstation.dme b/tgstation.dme index 7b5e4ddf4a..7e3c17510d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3935,6 +3935,7 @@ #include "GainStation13\code\clothing\shoes.dm" #include "GainStation13\code\clothing\suits.dm" #include "GainStation13\code\clothing\under.dm" +#include "GainStation13\code\datums\accents.dm" #include "GainStation13\code\datums\bark.dm" #include "GainStation13\code\datums\lavaland_ruins.dm" #include "GainStation13\code\datums\ruins.dm" @@ -4074,6 +4075,7 @@ #include "GainStation13\code\modules\research\nanites\nanite_programs\fattening.dm" #include "GainStation13\code\modules\research\techweb\nutritech_nodes.dm" #include "GainStation13\code\modules\surgery\organs\augments.dm" +#include "GainStation13\code\modules\surgery\organs\tongue.dm" #include "GainStation13\code\modules\vehicles\grocery_cart_scooter.dm" #include "GainStation13\code\modules\vehicles\grocery_cart_scooter_unmortorized.dm" #include "GainStation13\code\modules\vending\gatocola.dm"