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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
parent 06a47d15d5 8b9806c8c4
commit 6b935d64ec
192 changed files with 7436 additions and 5475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,7 @@
// Language handling.
/mob/proc/add_language(var/language)
var/datum/language/new_language = all_languages[language]
var/datum/language/new_language = GLOB.all_languages[language]
if(!istype(new_language) || (new_language in languages))
return 0
@@ -188,12 +188,12 @@
return 1
/mob/proc/remove_language(var/rem_language)
var/datum/language/L = all_languages[rem_language]
var/datum/language/L = GLOB.all_languages[rem_language]
. = (L in languages)
languages.Remove(L)
/mob/living/remove_language(rem_language)
var/datum/language/L = all_languages[rem_language]
var/datum/language/L = GLOB.all_languages[rem_language]
if(default_language == L)
default_language = null
return ..()
@@ -205,10 +205,10 @@
log_debug("[src] attempted to speak a null language.")
return 0
if(speaking == all_languages["Noise"])
if(speaking == GLOB.all_languages["Noise"])
return 1
if (only_species_language && speaking != all_languages[species_language])
if (only_species_language && speaking != GLOB.all_languages[species_language])
return 0
if(speaking.can_speak_special(src))
@@ -268,7 +268,7 @@
if(href_list["default_lang"])
if(href_list["default_lang"] == "reset")
if (species_language)
set_default_language(all_languages[species_language])
set_default_language(GLOB.all_languages[species_language])
else
set_default_language(null)
else

2
code/modules/mob/language/synthetic.dm
View File

@@ -18,7 +18,7 @@
if (!message)
return
message = speaker.say_emphasis(message)
message = encode_html_emphasis(message)
var/message_start = "<i><span class='game say'>[name], <span class='name'>[speaker.name]</span>"
var/message_body = "<span class='message'>[speaker.say_quote(message)], \"[message]\"</span></span></i>"