From c26c9047effe293c0ee3f6f715a2faa5def41e66 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 29 Nov 2024 19:59:50 +0100
Subject: [PATCH 1/5] tragedian gets its name back
---
code/game/jobs/job/civilian.dm | 4 ++--
maps/southern_cross/job/outfits.dm | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
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/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
From 86c45dd3bc7247e69793b90f649def28cf8c1632 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:36:20 +0100
Subject: [PATCH 2/5] those also need to use apply
---
code/modules/mob/language/language.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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))
From 46744776cc54a2c85ffe84c32475e57c0aabe8e5 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 29 Nov 2024 23:20:43 +0100
Subject: [PATCH 3/5] .
---
code/modules/admin/verbs/randomverbs.dm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index bc0547c4b5..beb3c75456 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/input = tgui_alert(usr, "Should this be announced to the general population?","Show world?",list("Yes","No"))
+ if(!input)
+ return
+ if(input == "Yes")
+ command_announcement.Announce(input, customname, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
+ if(input == "No")
+ 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)
From 98a18a4f41f9d7c0a72a04e5d5ab477c5e252a69 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 29 Nov 2024 23:21:38 +0100
Subject: [PATCH 4/5] .
---
code/modules/admin/verbs/randomverbs.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index beb3c75456..c8b77cacb1 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -667,7 +667,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
if(input == "Yes")
command_announcement.Announce(input, customname, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
- if(input == "No")
+ else
to_world(span_red("New [using_map.company_name] Update available at all communication consoles."))
world << sound('sound/AI/commandreport.ogg')
From 346193c2823d833d9580c748d93476c24c167144 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sat, 30 Nov 2024 11:59:13 +0100
Subject: [PATCH 5/5] .
---
code/modules/admin/verbs/randomverbs.dm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index c8b77cacb1..91c8b5ef93 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -662,10 +662,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
//New message handling
post_comm_message(customname, replacetext(input, "\n", "
"))
- var/input = tgui_alert(usr, "Should this be announced to the general population?","Show world?",list("Yes","No"))
- if(!input)
+ var/confirm = tgui_alert(usr, "Should this be announced to the general population?","Show world?",list("Yes","No"))
+ if(!confirm)
return
- if(input == "Yes")
+ 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."))