Merge pull request #2821 from ForFoxSake/soundsofthesynths

A Fix for Encoded Audio Language, and by Accident, Languages in General
This commit is contained in:
Anewbe
2016-11-25 22:13:34 -06:00
committed by GitHub
7 changed files with 23 additions and 3 deletions

View File

@@ -203,8 +203,10 @@
if(!(L.flags & NONGLOBAL))
if(L == default_language)
dat += "<b>[L.name] ([get_language_prefix()][L.key])</b> - default - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a><br/>[L.desc]<br/><br/>"
else
else if (can_speak(L))
dat += "<b>[L.name] ([get_language_prefix()][L.key])</b> - <a href='byond://?src=\ref[src];default_lang=\ref[L]'>set default</a><br/>[L.desc]<br/><br/>"
else
dat += "<b>[L.name] ([get_language_prefix()][L.key])</b> - cannot speak!<br/>[L.desc]<br/><br/>"
src << browse(dat, "window=checklanguage")

View File

@@ -3,6 +3,7 @@
/obj/item/device/mmi/digital/New()
src.brainmob = new(src)
src.brainmob.add_language("Robot Talk")
src.brainmob.add_language("Encoded Audio Language")
src.brainmob.loc = src
src.brainmob.container = src
src.brainmob.stat = 0

View File

@@ -57,5 +57,8 @@
canmove = 0
return canmove
/mob/living/carbon/brain/binarycheck()
/mob/living/carbon/brain/isSynthetic()
return istype(loc, /obj/item/device/mmi/digital)
/mob/living/carbon/brain/binarycheck()
return isSynthetic()

View File

@@ -446,7 +446,7 @@
chem_effects[effect] = magnitude
/mob/living/carbon/get_default_language()
if(default_language)
if(default_language && can_speak(default_language))
return default_language
if(!species)

View File

@@ -5,6 +5,10 @@
set name = "Set Default Language"
set category = "IC"
if(language && !can_speak(language))
src << "<span class='notice'>You are unable to speak that language.</span>"
return
if(language)
src << "<span class='notice'>You will now speak [language] if you do not specify a language when speaking.</span>"
else