Merge pull request #16655 from Kashargul/jobtitle

tragedian gets its name back
This commit is contained in:
Heroman3003
2024-12-07 05:04:05 +10:00
committed by GitHub
4 changed files with 15 additions and 13 deletions
+8 -6
View File
@@ -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", "<br/>"))
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)
+2 -2
View File
@@ -296,9 +296,9 @@
if(href_list["default_lang"])
if(href_list["default_lang"] == "reset")
if (species_language)
set_default_language(GLOB.all_languages[species_language])
apply_default_language(GLOB.all_languages[species_language])
else
set_default_language(GLOB.all_languages[LANGUAGE_GIBBERISH])
apply_default_language(GLOB.all_languages[LANGUAGE_GIBBERISH])
else
var/datum/language/L = locate(href_list["default_lang"])
if(L && (L in languages))