From ef8e5fdb70ff152aaee12474283086779cd1fed8 Mon Sep 17 00:00:00 2001 From: MeepleMuncher <76881946+MeepleMuncher@users.noreply.github.com> Date: Fri, 25 Apr 2025 01:12:54 +0300 Subject: [PATCH] Makes Hell Ramen and Soemmerfire not kill people (#17577) * makes spicy food not kill spicy characters * whoopsie * using preexisting capsaicin code instead of applying a band-aid fix * makes it into a proc! * ope, extra space there --- code/modules/reagents/reagents/food_drinks.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 74e872d527..dbf3ad0d41 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -802,6 +802,10 @@ M.adjustToxLoss(0.5 * removed) /datum/reagent/capsaicin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + handle_spicy(M, alien, removed) + +/datum/reagent/proc/handle_spicy(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_DIONA) return if(alien == IS_ALRAUNE) // VOREStation Edit: It wouldn't affect plants that much. @@ -2502,9 +2506,7 @@ /datum/reagent/drink/hell_ramen/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() - if(alien == IS_DIONA) - return - M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT + handle_spicy(M, alien, removed) /datum/reagent/drink/sweetsundaeramen name = REAGENT_DESSERTRAMEN @@ -4480,9 +4482,7 @@ /datum/reagent/ethanol/soemmerfire/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() - if(alien == IS_DIONA) - return - M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT + handle_spicy(M, alien, removed) /datum/reagent/ethanol/winebrandy name = REAGENT_WINEBRANDY