From 3767c82c0d39ed01d652247cba2fdc9ed1b9bcae Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:54:40 -0500 Subject: [PATCH] [MIRROR] Regenerative Materia Blobs No Longer Drug Non-Carbons (#823) * Regenerative Materia Blobs No Longer Drug Non-Carbons (#81318) ## About The Pull Request Fixes #79841 This PR fixes the bug where cyborgs could get high from being attacked by regenerative materia blobs by adding a requirement that the target is a carbon before applying the drug effect to them. ## Why It's Good For The Game This isn't believed to be intentional (its marked as a bug) and applying the drugginess effect to non-carbons has shown in the past to cause some issues (ex. cyborgs which have the high effect for much much longer than intended were it applied to a carbon) ## Changelog :cl: fix: Regenerative Materia blobs can no longer drug non-carbons. /:cl: * Regenerative Materia Blobs No Longer Drug Non-Carbons --------- Co-authored-by: IndieanaJones <47086570+IndieanaJones@users.noreply.github.com> --- .../antagonists/blob/blobstrains/regenerative_materia.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm b/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm index 0b70cc9c741..a62895ae6c4 100644 --- a/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm +++ b/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm @@ -18,7 +18,8 @@ /datum/reagent/blob/regenerative_materia/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/overmind) . = ..() reac_volume = return_mob_expose_reac_volume(exposed_mob, methods, reac_volume, show_message, touch_protection, overmind) - exposed_mob.adjust_drugginess(reac_volume * 2 SECONDS) + if(iscarbon(exposed_mob)) + exposed_mob.adjust_drugginess(reac_volume * 2 SECONDS) if(exposed_mob.reagents) exposed_mob.reagents.add_reagent(/datum/reagent/blob/regenerative_materia, 0.2*reac_volume) exposed_mob.reagents.add_reagent(/datum/reagent/toxin/spore, 0.2*reac_volume)