From b09c4f7b8575bc1db7a9e604cc7f47aafcf06cf7 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Tue, 29 Sep 2015 10:15:41 -0700 Subject: [PATCH] Add a few variables to the AI announcment message Variables added: - $species : Species name of the individual. - $age : Character age - $gender : Character gender, limited to female/male, sorry tumblr --- code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/mob/new_player/new_player.dm | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 286b2eebd64..9f19c511af1 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -838,7 +838,7 @@ var/list/ai_verbs_default = list( set desc = "Change the message that's transmitted when a new crew member arrives on station." set category = "AI Commands" - var/newmsg = input("What would you like the arrival message to be? Use $name to substitute the crew member's name, and use $rank to substitute the crew member's rank.", "Change Arrival Message", arrivalmsg) as text + var/newmsg = input("What would you like the arrival message to be? List of options: $name, $rank, $species, $gender, $age", "Change Arrival Message", arrivalmsg) as text if(newmsg != arrivalmsg) arrivalmsg = newmsg usr << "The arrival message has been successfully changed." diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 6f3bea0cef8..da87a2b7537 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -342,6 +342,9 @@ var/arrivalmessage = announcer.arrivalmsg arrivalmessage = replacetext(arrivalmessage,"$name",character.real_name) arrivalmessage = replacetext(arrivalmessage,"$rank",rank ? "[rank]" : "visitor") + arrivalmessage = replacetext(arrivalmessage,"$species",character.species.name) + arrivalmessage = replacetext(arrivalmessage,"$age",num2text(character.age)) + arrivalmessage = replacetext(arrivalmessage,"$gender",character.gender == FEMALE ? "Female" : "Male") announcer.say(";[arrivalmessage]") else if(character.mind) @@ -469,11 +472,11 @@ if(client.prefs.disabilities & DISABILITY_FLAG_BLIND) new_character.dna.SetSEState(BLINDBLOCK,1,1) new_character.sdisabilities |= BLIND - + if(client.prefs.disabilities & DISABILITY_FLAG_MUTE) new_character.dna.SetSEState(MUTEBLOCK,1,1) new_character.sdisabilities |= MUTE - + chosen_species.handle_dna(new_character) domutcheck(new_character)