diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 9a21c681bd0..6ede44d7ccc 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -197,7 +197,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use return wires.IsIndexCut(index) /obj/item/device/radio/proc/autosay(var/message, var/from, var/channel) //BS12 EDIT - testing("Autosaying.") var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) if (channel == "department") @@ -211,7 +210,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use return if (!connection) return - testing("Generating new AI for autosay.") var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1) Broadcast_Message(connection, A, 0, "*garbled automated announcement*", src, diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index adbbceae792..301e9d900bb 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -30,7 +30,7 @@ var/list/department_radio_keys = list( ":A" = "alientalk", "#A" = "alientalk", ".A" = "alientalk", ":T" = "Syndicate", "#T" = "Syndicate", ".T" = "Syndicate", ":U" = "Supply", "#U" = "Supply", ".U" = "Supply", - ":G" = "changeling", "#G" = "changeling", ".G" = "changeling" + ":G" = "changeling", "#G" = "changeling", ".G" = "changeling", //kinda localization -- rastaf0 //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding. diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 2236d1f1662..173ecb03a6c 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -56,7 +56,7 @@ var/list/ai_list = list() var/last_announcement = "" /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0) - testing("Spawning new AI.") + var/list/possibleNames = ai_names var/pickedName = null @@ -85,7 +85,7 @@ var/list/ai_list = list() make_laws() verbs += /mob/living/silicon/ai/proc/show_laws_verb - testing("Spawning new AI, stage 2.") + aiPDA = new/obj/item/device/pda/ai(src) aiPDA.owner = name aiPDA.ownjob = "AI" @@ -96,7 +96,7 @@ var/list/ai_list = list() aiRadio.myAi = src aiCamera = new/obj/item/device/camera/siliconcam/ai_camera(src) - testing("Spawning new AI, stage 3.") + if (istype(loc, /turf)) verbs.Add(/mob/living/silicon/ai/proc/ai_network_change, \ /mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \ @@ -148,7 +148,7 @@ var/list/ai_list = list() ai_list += src ..() return - testing("Spawning new AI, done.") + /mob/living/silicon/ai/Destroy() ai_list -= src ..() diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index e1f26d66104..31102e8775e 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -291,7 +291,6 @@ proc/AttemptLateSpawn(rank) - testing("Attempting late spawn of [src], [usr]") if (src != usr) return 0 if(!ticker || ticker.current_state != GAME_STATE_PLAYING) @@ -330,9 +329,7 @@ proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank) - testing("Announcing arrival.") if (ticker.current_state == GAME_STATE_PLAYING) - testing("Announcing arrival of [character.real_name].") var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI. if(character.mind.role_alt_title) rank = character.mind.role_alt_title