cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16655 from Kashargul/jobtitle

Browse Source 
tragedian gets its name back
This commit is contained in:
Heroman3003
2024-12-07 05:04:05 +10:00
committed by GitHub
parent 780c07439b 346193c282
commit 60fd487c76
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/civilian.dm
+2 -2
View File
@@ -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
code/modules/admin/verbs/randomverbs.dm
+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)
code/modules/mob/language/language.dm
+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))
maps/southern_cross/job/outfits.dm
+3 -3
View File
@@ -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