From b2e932c13138e07a952d37678d3312172566eccb Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 10 May 2017 23:59:32 -0400 Subject: [PATCH 1/3] thrall check --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 5fb697c7142..6afa23aed9c 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -443,7 +443,7 @@ msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n" - if(!wear_mask && is_thrall(src) && in_range(user,src)) + if(!(wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) && is_thrall(src) && in_range(user,src)) msg += "Their features seem unnaturally tight and drawn.\n" if(decaylevel == 1) msg += "[t_He] [t_is] starting to smell.\n" From 88cc7c6113f5207f3222a0c7a296c1458a891aee Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 11 May 2017 01:39:18 -0400 Subject: [PATCH 2/3] false tweak --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 6afa23aed9c..9667f3e1daf 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -443,7 +443,7 @@ msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n" - if(!(wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) && is_thrall(src) && in_range(user,src)) + if(!(skipmask || wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) && is_thrall(src) && in_range(user,src)) msg += "Their features seem unnaturally tight and drawn.\n" if(decaylevel == 1) msg += "[t_He] [t_is] starting to smell.\n" From 841ef7bcf80e37972ffbec1c0ffedd004b46c777 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 11 May 2017 01:39:47 -0400 Subject: [PATCH 3/3] NOPE ..skipface not skipmask.. --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 9667f3e1daf..7983afb8c14 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -443,7 +443,7 @@ msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n" - if(!(skipmask || wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) && is_thrall(src) && in_range(user,src)) + if(!(skipface || wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) && is_thrall(src) && in_range(user,src)) msg += "Their features seem unnaturally tight and drawn.\n" if(decaylevel == 1) msg += "[t_He] [t_is] starting to smell.\n"