diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 0604b872e4..34883ef8b6 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -350,8 +350,8 @@ title_blurb = "A " + JOB_ALT_COMEDIAN + " will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!" /datum/alt_title/tragedian - title = JOB_ALT_ARTIST - title_blurb = "A " + JOB_ALT_ARTIST + " will focus on making people think about life and world around them! Life is a tragedy, and who's better to convey its emotions than you?" + title = JOB_ALT_TRAGEDIAN + title_blurb = "A " + JOB_ALT_TRAGEDIAN + " will focus on making people think about life and world around them! Life is a tragedy, and who's better to convey its emotions than you?" /datum/alt_title/artist title = JOB_ALT_ARTIST diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index bc0547c4b5..91c8b5ef93 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 44626f5e0e..a41f45ef35 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -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)) diff --git a/maps/southern_cross/job/outfits.dm b/maps/southern_cross/job/outfits.dm index f2ef7db2ee..95db358a21 100644 --- a/maps/southern_cross/job/outfits.dm +++ b/maps/southern_cross/job/outfits.dm @@ -54,9 +54,9 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go id_pda_assignment = JOB_PILOT flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL - headset = /obj/item/radio/headset/pilot/alt - headset_alt = /obj/item/radio/headset/pilot/alt - headset_earbud = /obj/item/radio/headset/pilot/alt + headset = /obj/item/radio/headset/alt/pilot + headset_alt = /obj/item/radio/headset/alt/pilot + headset_earbud = /obj/item/radio/headset/alt/pilot /decl/hierarchy/outfit/job/medical/sar name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit