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

Merge pull request #8215 from GinjaNinja32/language

Browse Source 
Fixes a few issues with noise-language.
This commit is contained in:
Zuhayr
2015-02-24 07:49:37 +10:30
parent 220d029baf e47c45591c
commit 09f15f98f2
5 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/game/objects/items/devices/taperecorder.dm
View File

@@ -20,26 +20,14 @@
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20
/obj/item/device/taperecorder/hear_talk(mob/living/M as mob, msg, var/verb="says") /obj/item/device/taperecorder/hear_talk(mob/living/M as mob, msg, var/verb="says", datum/language/speaking=null)
if(recording) if(recording)
//var/ending = copytext(msg, length(msg)) timestamp += timerecorded
timestamp+= timerecorded
/* if(speaking)
if(M.stuttering) storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] [speaking.format_message_plain(msg, verb)]"
storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] stammers, \"[msg]\"" else
return
if(M.getBrainLoss() >= 60)
storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] gibbers, \"[msg]\""
return
if(ending == "?")
storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] asks, \"[msg]\""
return
else if(ending == "!")
storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] exclaims, \"[msg]\""
return
*/
storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] [verb], \"[msg]\"" storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] [verb], \"[msg]\""
return
/obj/item/device/taperecorder/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/device/taperecorder/attackby(obj/item/weapon/W as obj, mob/user as mob)
..() ..()

1
code/modules/admin/admin.dm
View File

@@ -186,6 +186,7 @@ var/global/floorIsLava = 0
var/f = 1 var/f = 1
for(var/k in all_languages) for(var/k in all_languages)
var/datum/language/L = all_languages[k] var/datum/language/L = all_languages[k]
if(!(L.flags & INNATE))
if(!f) body += " | " if(!f) body += " | "
else f = 0 else f = 0
if(L in M.languages) if(L in M.languages)

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

@@ -88,6 +88,9 @@
/datum/language/proc/format_message(message, verb) /datum/language/proc/format_message(message, verb)
return "[verb], <span class='message'><span class='[colour]'>\"[capitalize(message)]\"</span></span>" return "[verb], <span class='message'><span class='[colour]'>\"[capitalize(message)]\"</span></span>"
/datum/language/proc/format_message_plain(message, verb)
return "[verb], \"[capitalize(message)]\""
/datum/language/proc/format_message_radio(message, verb) /datum/language/proc/format_message_radio(message, verb)
return "[verb], <span class='[colour]'>\"[capitalize(message)]\"</span>" return "[verb], <span class='[colour]'>\"[capitalize(message)]\"</span>"
@@ -121,11 +124,14 @@
name = "Noise" name = "Noise"
desc = "Noises" desc = "Noises"
key = "" key = ""
flags = RESTRICTED|NONGLOBAL|INNATE|NO_TALK_MSG flags = RESTRICTED|NONGLOBAL|INNATE|NO_TALK_MSG|NO_STUTTER
/datum/language/noise/format_message(message, verb) /datum/language/noise/format_message(message, verb)
return "<span class='message'><span class='[colour]'>[message]</span></span>" return "<span class='message'><span class='[colour]'>[message]</span></span>"
/datum/language/noise/format_message_plain(message, verb)
return message
/datum/language/noise/format_message_radio(message, verb) /datum/language/noise/format_message_radio(message, verb)
return "<span class='[colour]'>[message]</span>" return "<span class='[colour]'>[message]</span>"

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

@@ -36,6 +36,8 @@
else else
message = copytext(message,3) message = copytext(message,3)
message = trim_left(message)
//parse the language code and consume it //parse the language code and consume it
var/datum/language/speaking = parse_language(message) var/datum/language/speaking = parse_language(message)
if(speaking) if(speaking)
@@ -61,6 +63,7 @@
message = trim(message) message = trim(message)
if(speech_problem_flag) if(speech_problem_flag)
if(!speaking || !(speaking.flags & NO_STUTTER))
var/list/handle_r = handle_speech_problems(message) var/list/handle_r = handle_speech_problems(message)
message = handle_r[1] message = handle_r[1]
verb = handle_r[2] verb = handle_r[2]

1
code/setup.dm
View File

@@ -681,6 +681,7 @@ var/list/be_special_flags = list(
#define NONGLOBAL 32 // Do not add to general languages list #define NONGLOBAL 32 // Do not add to general languages list
#define INNATE 64 // All mobs can be assumed to speak and understand this language (audible emotes) #define INNATE 64 // All mobs can be assumed to speak and understand this language (audible emotes)
#define NO_TALK_MSG 128 // Do not show the "\The [speaker] talks into \the [radio]" message #define NO_TALK_MSG 128 // Do not show the "\The [speaker] talks into \the [radio]" message
#define NO_STUTTER 256 // No stuttering, slurring, or other speech problems
//Flags for zone sleeping //Flags for zone sleeping
#define ZONE_ACTIVE 1 #define ZONE_ACTIVE 1