Merge pull request #2077 from Markolie/languages

Language fixes
This commit is contained in:
Fox-McCloud
2015-09-17 16:30:45 -04:00
6 changed files with 12 additions and 14 deletions
+4 -1
View File
@@ -127,6 +127,9 @@
playsound(src.loc, meteorsound, 40, 1)
get_hit()
/obj/effect/meteor/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
return istype(mover, /obj/effect/meteor) ? 1 : ..()
/obj/effect/meteor/proc/ram_turf(var/turf/T)
//first bust whatever is in the turf
for(var/atom/A in T)
@@ -195,7 +198,7 @@
//Large-sized
/obj/effect/meteor/big
name = "big meteor"
name = "large meteor"
icon_state = "large"
hits = 6
heavy = 1
+3 -3
View File
@@ -73,7 +73,7 @@
id = "Receiver B"
network = "tcommsat"
autolinkers = list("receiverB") // link to relay
freq_listening = list(COMM_FREQ, ENG_FREQ, SEC_FREQ)
freq_listening = list(AI_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ)
//Common and other radio frequencies for people to freely use
New()
@@ -182,10 +182,10 @@
/obj/machinery/telecomms/server/presets/common
id = "Common Server"
freq_listening = list()
freq_listening = list(PUB_FREQ, AI_FREQ)
autolinkers = list("common")
//Common and other radio frequencies for people to freely use
//Common and other radio frequencies for people to freely use
/obj/machinery/telecomms/server/presets/common/New()
for(var/i = PUBLIC_LOW_FREQ, i < PUBLIC_HIGH_FREQ, i += 2)
freq_listening |= i
+1 -1
View File
@@ -130,7 +130,7 @@ var/list/ai_verbs_default = list(
aiRadio = new(src)
common_radio = aiRadio
aiRadio.myAi = src
additional_law_channels["Binary"] = ":b"
additional_law_channels["Binary"] = ":b "
additional_law_channels["Holopad"] = ":h"
aiCamera = new/obj/item/device/camera/siliconcam/ai_camera(src)
@@ -1,9 +1,3 @@
/mob/living/silicon/ai/say(var/message)
if(parent && istype(parent) && parent.stat != 2)
return parent.say(message)
//If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead.
return ..(message)
/mob/living/silicon/ai/proc/IsVocal()
var/announcing_vox = 0 // Stores the time of the last announcement
@@ -152,7 +152,7 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/proc/init(var/alien=0)
aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
make_laws()
additional_law_channels["Binary"] = ":b"
additional_law_channels["Binary"] = ":b "
var/new_ai = select_active_ai_with_fewest_borgs()
if(new_ai)
lawupdate = 1
+3 -2
View File
@@ -1,3 +1,4 @@
/mob/proc/say()
return
@@ -129,11 +130,11 @@
//parses the language code (e.g. :j) from text, such as that supplied to say.
//returns the language object only if the code corresponds to a language that src can speak, otherwise null.
/mob/proc/parse_language(var/message)
if(length(message) >= 1 && copytext(message,1,2) == "!")
var/prefix = copytext(message,1,2)
if(length(message) >= 1 && prefix == "!")
return all_languages["Noise"]
if(length(message) >= 2)
var/language_prefix = trim_right(lowertext(copytext(message, 1 ,4)))
var/datum/language/L = language_keys[language_prefix]
if (can_speak(L))