From e020c7c4cf5106f9a2e2ec7dd90f20f719525aaa Mon Sep 17 00:00:00 2001 From: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> Date: Tue, 27 Aug 2024 21:37:34 +0100 Subject: [PATCH] IPC Clowns and Mimes now heal from the Clown and Mime drinks. (#26533) * 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> --------- Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> --- .../chemistry/reagents/drinks_reagents.dm | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index 86e51200e80..947ac4fe001 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -173,32 +173,34 @@ id = "banana" description = "The raw essence of a banana." color = "#F6F834" + process_flags = ORGANIC | SYNTHETIC drink_icon = "banana" drink_name = "Glass of banana juice" drink_desc = "The raw essence of a banana. HONK" taste_description = "banana juice" -/datum/reagent/consumable/drink/banana/on_mob_life(mob/living/M) +/datum/reagent/consumable/drink/banana/on_mob_life(mob/living/carbon/human/M) var/update_flags = STATUS_UPDATE_NONE if(HAS_TRAIT(M, TRAIT_COMIC_SANS) || issmall(M)) - update_flags |= M.adjustBruteLoss(-1, FALSE) - update_flags |= M.adjustFireLoss(-1, FALSE) + update_flags |= M.adjustBruteLoss(-1, FALSE, robotic = TRUE) + update_flags |= M.adjustFireLoss(-1, FALSE, robotic = TRUE) return ..() | update_flags /datum/reagent/consumable/drink/nothing name = "Nothing" id = "nothing" description = "Absolutely nothing." + process_flags = ORGANIC | SYNTHETIC drink_icon = "nothing" drink_name = "Nothing" drink_desc = "Absolutely nothing." taste_description = "nothing... how?" -/datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/M) +/datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/carbon/human/M) var/update_flags = STATUS_UPDATE_NONE if(ishuman(M) && M.mind && M.mind.miming) - update_flags |= M.adjustBruteLoss(-1, FALSE) - update_flags |= M.adjustFireLoss(-1, FALSE) + update_flags |= M.adjustBruteLoss(-1, FALSE, robotic = TRUE) + update_flags |= M.adjustFireLoss(-1, FALSE, robotic = TRUE) return ..() | update_flags /datum/reagent/consumable/drink/potato_juice @@ -401,16 +403,17 @@ id = "bananahonk" description = "A drink from Clown Heaven." color = "#664300" // rgb: 102, 67, 0 + process_flags = ORGANIC | SYNTHETIC drink_icon = "bananahonkglass" drink_name = "Banana Honk" drink_desc = "A drink from Banana Heaven." taste_description = "HONK" -/datum/reagent/consumable/drink/bananahonk/on_mob_life(mob/living/M) +/datum/reagent/consumable/drink/bananahonk/on_mob_life(mob/living/carbon/human/M) var/update_flags = STATUS_UPDATE_NONE if(HAS_TRAIT(M, TRAIT_COMIC_SANS) || issmall(M)) - update_flags |= M.adjustBruteLoss(-1, FALSE) - update_flags |= M.adjustFireLoss(-1, FALSE) + update_flags |= M.adjustBruteLoss(-1, FALSE, robotic = TRUE) + update_flags |= M.adjustFireLoss(-1, FALSE, robotic = TRUE) return ..() | update_flags /datum/reagent/consumable/drink/silencer @@ -418,16 +421,17 @@ id = "silencer" description = "A drink from Mime Heaven." color = "#664300" // rgb: 102, 67, 0 + process_flags = ORGANIC | SYNTHETIC drink_icon = "silencerglass" drink_name = "Silencer" drink_desc = "A drink from mime Heaven." taste_description = "mphhhh" -/datum/reagent/consumable/drink/silencer/on_mob_life(mob/living/M) +/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"))) - update_flags |= M.adjustBruteLoss(-1, FALSE) - update_flags |= M.adjustFireLoss(-1, FALSE) + update_flags |= M.adjustBruteLoss(-1, FALSE, robotic = TRUE) + update_flags |= M.adjustFireLoss(-1, FALSE, robotic = TRUE) return ..() | update_flags /datum/reagent/consumable/drink/chocolatepudding