From 1f095d0c33da4c34de9a645164efc7ff6c024b5d Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 26 Nov 2015 03:46:23 -0500 Subject: [PATCH] Fixes facehugger-related bugs. --- code/modules/mob/living/carbon/alien/special/facehugger.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 21711ee9569..08e5d444116 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -84,7 +84,7 @@ var/const/MAX_ACTIVE_TIME = 400 return 0 /obj/item/clothing/mask/facehugger/HasProximity(atom/movable/AM as mob|obj) - if(CanHug(AM)) + if(CanHug(AM) && Adjacent(AM)) return Attach(AM) return 0 @@ -230,7 +230,7 @@ var/const/MAX_ACTIVE_TIME = 400 return 1 var/mob/living/carbon/C = M - if(ishuman(C)) + if(ishuman(C) && !(slot_wear_mask in C.dna.species.no_equip)) var/mob/living/carbon/human/H = C if(H.is_mouth_covered(head_only = 1)) return 0