From 008f35d87b458aa0a45dfa1519e0e6ecbe8641e2 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 1 Aug 2015 01:45:51 +0200 Subject: [PATCH] When masks are adjusted, allow CPR --- code/modules/mob/living/carbon/human/human_attackhand.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index f6bc3b36f1d..8a5e18419d6 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -65,11 +65,11 @@ return 1 // if(M.health < -75) return 0 - if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH))) - M << "\blue Remove your mask!" + if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH) && !mask_adjusted)) + M << "Remove your mask!" return 0 - if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH))) - M << "\blue Remove his mask!" + if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH) && !mask_adjusted)) + M << "Remove his mask!" return 0 var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human()