From 6e4e7fd15537c2004dde059c6ad6434853c31afa Mon Sep 17 00:00:00 2001 From: Ramke <99222453+Spookat@users.noreply.github.com> Date: Mon, 10 Jul 2023 02:01:42 +0100 Subject: [PATCH] pill (#16663) --- code/modules/reagents/Chemistry-Reagents.dm | 6 ++- html/changelogs/ramke - pillening.yml | 41 +++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/ramke - pillening.yml diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 83a6d7ae281..ad05d56efa3 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -171,4 +171,8 @@ //Check to use when seeing if the person has the minimum dose of the reagent. Useful for stopping minimum transfer rate IV drips from applying chem effects /singleton/reagent/proc/check_min_dose(var/mob/living/carbon/M, var/min_dose = 1) - return (REAGENT_VOLUME(M.reagents, type) >= min_dose) + var/dose = REAGENT_VOLUME(M.reagents, type) >= min_dose + var/obj/item/organ/internal/stomach/S = M.internal_organs_by_name[BP_STOMACH] + if(S) + dose += REAGENT_VOLUME(S.ingested, type) >= min_dose + return dose diff --git a/html/changelogs/ramke - pillening.yml b/html/changelogs/ramke - pillening.yml new file mode 100644 index 00000000000..f5c23091fb1 --- /dev/null +++ b/html/changelogs/ramke - pillening.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Ramke + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Chems that check for minimum dose (i.e. mortaphenyl, perconol) now work if ingested."