diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 61cec81161..e9c8b87720 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -662,12 +662,14 @@ Traitors and the like can also be revived with the previous role mostly intact. //New message handling post_comm_message(customname, replacetext(input, "\n", "
")) - switch(tgui_alert(usr, "Should this be announced to the general population?","Show world?",list("Yes","No"))) - if("Yes") - command_announcement.Announce(input, customname, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1); - if("No") - to_world(span_red("New [using_map.company_name] Update available at all communication consoles.")) - world << sound('sound/AI/commandreport.ogg') + var/confirm = tgui_alert(usr, "Should this be announced to the general population?","Show world?",list("Yes","No")) + if(!confirm) + return + if(confirm == "Yes") + command_announcement.Announce(input, customname, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1); + else + to_world(span_red("New [using_map.company_name] Update available at all communication consoles.")) + world << sound('sound/AI/commandreport.ogg') log_admin("[key_name(src)] has created a command report: [input]") message_admins("[key_name_admin(src)] has created a command report", 1) diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index defa8c3853..cdd87a3a8f 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -298,9 +298,9 @@ if(href_list["default_lang"]) if(href_list["default_lang"] == "reset") if (species_language) - apply_default_language(GLOB.all_languages[species_language]) //CHOMPEdit + apply_default_language(GLOB.all_languages[species_language]) else - apply_default_language(GLOB.all_languages[LANGUAGE_GIBBERISH]) //CHOMPEdit + apply_default_language(GLOB.all_languages[LANGUAGE_GIBBERISH]) else var/datum/language/L = locate(href_list["default_lang"]) if(L && (L in languages))