From 6257b9a54eadecd6a62a7e8fa6405a8d2e17d7e6 Mon Sep 17 00:00:00 2001 From: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> Date: Tue, 10 Sep 2024 00:49:23 +0100 Subject: [PATCH] Mime drink consistency (#26635) * Makes Mime and Clown drinks heal IPC Clowns and Mimes too. Previously, the four Clown and Mime drinks (Banana Juice, Banana HONK, Nothing, and Silencer) only healed organics. This commit should allow said drinks to heal IPCs too. Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Pasted wrong code. Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Apply suggestions from code review to remove unnecessary code and to pass CI checks. Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Ensures robotic limbs are healed, also pass CI. Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Previous commit broke something. Going to try CRUNCH's suggested changes. Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Should pass CI this time. Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Put living back in. Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> * Makes Mime Drinks consistent. Changes Silencer to use the same check as nothing for the special effect. --------- Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> --- code/modules/reagents/chemistry/reagents/drinks_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index 947ac4fe001..c1561de6b6e 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -429,7 +429,7 @@ /datum/reagent/consumable/drink/silencer/on_mob_life(mob/living/carbon/human/M) var/update_flags = STATUS_UPDATE_NONE - if(ishuman(M) && (M.job in list("Mime"))) + if(ishuman(M) && M.mind && M.mind.miming) update_flags |= M.adjustBruteLoss(-1, FALSE, robotic = TRUE) update_flags |= M.adjustFireLoss(-1, FALSE, robotic = TRUE) return ..() | update_flags