cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6689

Browse Source
This commit is contained in:
Zuhayr
2014-10-13 17:16:23 +10:30
parent 06ad91f417
commit c5e2fa74e6
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/language.dm
View File

@@ -6,6 +6,8 @@
var/name = "an unknown language" // Fluff name of language if any. var/name = "an unknown language" // Fluff name of language if any.
var/desc = "A language." // Short description for 'Check Languages'. var/desc = "A language." // Short description for 'Check Languages'.
var/speech_verb = "says" // 'says', 'hisses', 'farts'. var/speech_verb = "says" // 'says', 'hisses', 'farts'.
var/ask_verb = "asks" // Used when sentence ends in a ?
var/exclaim_verb = "exclaims" // Used when sentence ends in a !
var/signlang_verb = list() // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags var/signlang_verb = list() // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags
var/colour = "body" // CSS style to use for strings in this language. var/colour = "body" // CSS style to use for strings in this language.
var/key = "x" // Character used to speak in language eg. :o for Unathi. var/key = "x" // Character used to speak in language eg. :o for Unathi.
@@ -33,6 +35,14 @@
/datum/language/proc/check_special_condition(var/mob/other) /datum/language/proc/check_special_condition(var/mob/other)
return 1 return 1
/datum/language/proc/get_spoken_verb(var/msg_end)
switch(msg_end)
if("!")
return exclaim_verb
if("?")
return ask_verb
return speech_verb
/datum/language/unathi /datum/language/unathi
name = "Sinta'unathi" name = "Sinta'unathi"
desc = "The common language of Moghes, composed of sibilant hisses and rattles. Spoken natively by Unathi." desc = "The common language of Moghes, composed of sibilant hisses and rattles. Spoken natively by Unathi."

15
code/modules/mob/living/carbon/human/say.dm
View File

@@ -232,16 +232,17 @@
/mob/living/carbon/human/say_quote(var/message, var/datum/language/speaking = null) /mob/living/carbon/human/say_quote(var/message, var/datum/language/speaking = null)
var/verb = "says" var/verb = "says"
var/ending = copytext(message, length(message)) var/ending = copytext(message, length(message))
if(ending=="!")
verb=pick("exclaims","shouts","yells") if(speaking)
else if(ending=="?") verb = speaking.get_spoken_verb(ending)
verb="asks" else
if(ending == "!")
verb=pick("exclaims","shouts","yells")
else if(ending == "?")
verb="asks"
return verb return verb
/mob/living/carbon/human/proc/handle_speech_problems(var/message) /mob/living/carbon/human/proc/handle_speech_problems(var/message)
var/list/returns[3] var/list/returns[3]
var/verb = "says" var/verb = "says"