From 67d1cafc2937dc887805b848b88a41fb0a408cd9 Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 17 Sep 2015 03:42:14 +0200 Subject: [PATCH 1/3] Language fixes --- code/game/machinery/telecomms/presets.dm | 6 +++--- code/modules/mob/living/silicon/ai/say.dm | 6 ------ code/modules/mob/say.dm | 6 +++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 4d018002861..b77682201af 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -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 diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 9bfa1cc1298..96954d82d25 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -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 diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index b49812d63fb..ac0c4d10432 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -129,12 +129,12 @@ //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/language_prefix = lowertext(copytext(message, 1, 3)) var/datum/language/L = language_keys[language_prefix] if (can_speak(L)) return L From 82b3d8c469781a2ada42d3d2d393a8ce87686dd4 Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 17 Sep 2015 18:30:53 +0200 Subject: [PATCH 2/3] Temporarily revert language fix pending language prefix rewrite --- code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 2 +- code/modules/mob/say.dm | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 52a83482fdb..286b2eebd64 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -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) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e6782d30ef7..eee0d036adc 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -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 diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index ac0c4d10432..64b0118b46b 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -1,3 +1,4 @@ + /mob/proc/say() return @@ -134,7 +135,7 @@ return all_languages["Noise"] if(length(message) >= 2) - var/language_prefix = lowertext(copytext(message, 1, 3)) + var/language_prefix = trim_right(lowertext(copytext(message, 1 ,4))) var/datum/language/L = language_keys[language_prefix] if (can_speak(L)) return L From f4f42ab17b838e86bb131e3ed099ffe360e7623a Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 17 Sep 2015 18:32:39 +0200 Subject: [PATCH 3/3] Make meteors not collide with eachother --- code/game/gamemodes/meteor/meteors.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 87e44fc04a9..23611eb1af5 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -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