From 4722b803006f39fb426609b47d3b7c5682dbe06c Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Mon, 13 Sep 2021 10:50:10 -0400 Subject: [PATCH 1/2] Checks equipped glasses or headgear instead of just contents --- code/modules/mob/living/carbon/human/human.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9cbec689ade..b774c70bf2e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1679,9 +1679,14 @@ Eyes need to have significantly high darksight to shine unless the mob has the X return return md5(dna.uni_identity) -/mob/living/carbon/human/can_see_reagents() - for(var/obj/item/clothing/C in src) //If they have some clothing equipped that lets them see reagents, they can see reagents - if(C.scan_reagents) +/mob/living/carbon/human/can_see_reagents() //If they have some glases or helmet equipped that lets them see reagents, they can see reagents + if(istype(head, /obj/item/clothing/head)) + var/obj/item/clothing/head/hat = head + if(hat.scan_reagents) + return 1 + if(istype(glasses, /obj/item/clothing/glasses)) + var/obj/item/clothing/rscan = glasses + if(rscan.scan_reagents) return 1 /mob/living/carbon/human/can_eat(flags = 255) From 6e5c0f9b38096a8cd26b06589a242ce6be2d4f9d Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Mon, 13 Sep 2021 11:01:38 -0400 Subject: [PATCH 2/2] Spelling --- code/modules/mob/living/carbon/human/human.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b774c70bf2e..f288590e443 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1679,7 +1679,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X return return md5(dna.uni_identity) -/mob/living/carbon/human/can_see_reagents() //If they have some glases or helmet equipped that lets them see reagents, they can see reagents +/mob/living/carbon/human/can_see_reagents() //If they have some glasses or helmet equipped that lets them see reagents, they can see reagents if(istype(head, /obj/item/clothing/head)) var/obj/item/clothing/head/hat = head if(hat.scan_reagents)