From 0fa40f4650a53b828fa39f711db171595d40c8ef Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 18 Apr 2016 06:45:26 -0400 Subject: [PATCH] tweaks --- code/modules/mob/language.dm | 3 +++ code/modules/mob/living/carbon/human/human.dm | 4 ++-- config/example/config.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index d7471df1139..8998f39ea27 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -433,6 +433,9 @@ key = "zw" //doesn't matter, this is their default and only language flags = RESTRICTED | HIVEMIND +/datum/language/abductor/broadcast(var/mob/living/speaker,var/message,var/speaker_mask) + ..(speaker,message,speaker.real_name) + /datum/language/abductor/check_special_condition(var/mob/living/carbon/human/other, var/mob/living/carbon/human/speaker) if(other.mind && other.mind.abductor) if(other.mind.abductor.team == speaker.mind.abductor.team) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index e41ee392b60..45d1c3350c0 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -691,14 +691,14 @@ //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere /mob/living/carbon/human/get_visible_name() + if(name_override) + return name_override if(wear_mask && (wear_mask.flags_inv & HIDEFACE)) //Wearing a mask which hides our face, use id-name if possible return get_id_name("Unknown") if(head && (head.flags_inv & HIDEFACE)) return get_id_name("Unknown") //Likewise for hats var/face_name = get_face_name() var/id_name = get_id_name("") - if(name_override) - return name_override if(id_name && (id_name != face_name)) return "[face_name] (as [id_name])" return face_name diff --git a/config/example/config.txt b/config/example/config.txt index 1af839d039e..1ed02a543d1 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -73,6 +73,7 @@ KICK_INACTIVE PROBABILITY EXTENDED 2 PROBABILITY MALFUNCTION 2 PROBABILITY NUCLEAR 3 +PROBABILITY ABDUCTION 2 PROBABILITY CHANGELING 3 PROBABILITY CULT 4 PROBABILITY EXTEND-A-TRAITORMONGOUS 5