From 1453c244e53461ae4ee7ad3b906c7cddb4117c3e Mon Sep 17 00:00:00 2001 From: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com> Date: Thu, 22 Apr 2021 16:36:00 -0400 Subject: [PATCH] Gives Greys FluoroSulphuric Acid immunity (#15909) * Fixes Gloves of the North Star exploit. * Update miscellaneous.dm * Update miscellaneous.dm * Create miscellaneous.dm * Update code/modules/clothing/gloves/miscellaneous.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * Update code/modules/clothing/gloves/miscellaneous.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * commit on 'master' * commit on 'master' * master * 'singularityhammer' * commit * adds !isgray to facid Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --- code/modules/mob/living/carbon/human/species/grey.dm | 2 +- code/modules/reagents/chemistry/reagents/toxins.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm index 26b56be2315..915d0072434 100644 --- a/code/modules/mob/living/carbon/human/species/grey.dm +++ b/code/modules/mob/living/carbon/human/species/grey.dm @@ -81,7 +81,7 @@ to_chat(H, "A speech translator implant has been installed due to your role on the station.") /datum/species/grey/handle_reagents(mob/living/carbon/human/H, datum/reagent/R) - if(R.id == "sacid") + if(R.id == "sacid" || R.id == "facid") H.reagents.remove_reagent(R.id, REAGENTS_METABOLISM) return FALSE if(R.id == "water") diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index b69c8256c0b..c286c6a8ae4 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -334,7 +334,7 @@ return ..() | update_flags /datum/reagent/acid/facid/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) - if(ishuman(M)) + if(ishuman(M) && !isgrey(M)) var/mob/living/carbon/human/H = M if(method == REAGENT_TOUCH) if(volume > 9)