From 6e6c2c7c3e87ee06a963ef1538d55566fde81922 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 20 Mar 2022 10:53:37 -0800 Subject: [PATCH 1/2] Merge pull request #8426 from Mechoid/PrometheanHandClean Prometheans now do not clean items through gloves. --- .../carbon/human/species/station/prometheans.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index b1c468dac70..7cbda7fed97 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -210,12 +210,13 @@ var/datum/species/shapeshifter/promethean/prometheans H.adjust_nutrition(rand(10, 20)) if(H.clean_blood(1)) H.adjust_nutrition(rand(5, 15)) - if(H.r_hand) - if(H.r_hand.clean_blood()) - H.adjust_nutrition(rand(5, 15)) - if(H.l_hand) - if(H.l_hand.clean_blood()) - H.adjust_nutrition(rand(5, 15)) + if(!(H.gloves || (H.wear_suit && (H.wear_suit.body_parts_covered & HANDS)))) + if(H.r_hand) + if(H.r_hand.clean_blood()) + H.adjust_nutrition(rand(5, 15)) + if(H.l_hand) + if(H.l_hand.clean_blood()) + H.adjust_nutrition(rand(5, 15)) if(H.head) if(H.head.clean_blood()) H.update_inv_head(0)