From 8d1fe5b829381dc67790f678958f94465d449ee3 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 1 Jun 2017 19:17:57 -0300 Subject: [PATCH] Fix ipcs being blinded by pepper spray (#2561) Fixes #2559 Fixes #1154 --- code/modules/clothing/suits/jobs.dm | 2 +- code/modules/clothing/suits/wiz_robe.dm | 2 +- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 83c1196b6bb..e5cd20d10fb 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -27,7 +27,7 @@ icon_state = "capjacket" item_state = "capjacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags_inv = HIDEJUMPSUIT + flags_inv = 0 //Chaplain /obj/item/clothing/suit/chaplain_hoodie diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index b279489c4c6..5bb51545215 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -111,7 +111,7 @@ icon_state = "gentlecoat" item_state = "gentlecoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - flags_inv = null + flags_inv = 0 /obj/item/clothing/suit/wizrobe/fake name = "wizard robe" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 6e32a024fc7..052f013fb55 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -493,6 +493,8 @@ var/list/protection if(istype(M, /mob/living/carbon/human)) + if(M.isSynthetic()) + return var/mob/living/carbon/human/H = M protection = list(H.head, H.glasses, H.wear_mask) if(H.species && (H.species.flags & NO_PAIN))