shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64 from SeepingVisage/kitty-accent

Browse Source 
Kitty accent
This commit is contained in:
evilew
2025-01-12 14:26:27 +01:00
committed by GitHub
parent 258791d4fe 088d823be2
commit 214bcf46b0
5 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
GainStation13/code/datums/accents.dm Normal file
View File

@@ -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

8
GainStation13/code/modules/surgery/organs/tongue.dm Normal file
View File

@@ -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)

2
code/_globalvars/lists/flavor_misc.dm
View File

@@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
//LANGUAGE CHARACTER CUSTOMIZATION
GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks","mumbles","crackles"))
GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien/hybrid))
GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien/hybrid, "kitty tongue" = /obj/item/organ/tongue/kitty)) //GS13 - added kitty tongue to list of roundstart tongues
/proc/get_roundstart_languages()
var/list/languages = subtypesof(/datum/language)

1
code/modules/mob/living/carbon/human/species_types/felinid.dm
View File

@@ -8,6 +8,7 @@
mutantears = /obj/item/organ/ears/cat
mutanttail = /obj/item/organ/tail/cat
mutanttongue = /obj/item/organ/tongue/kitty //GS13 - felinids start with kitty tongue
tail_type = "mam_tail"
wagging_type = "mam_waggingtail"

2
tgstation.dme
View File

@@ -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"
@@ -4075,6 +4076,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"