From ab3acb1b9c19be2c29a505722a9c586f125dba14 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 3 Mar 2024 20:53:32 +0100 Subject: [PATCH] Fixes a server crashing bug with reagents. (#18590) Co-authored-by: Matt Atlas --- code/modules/reagents/Chemistry-Holder.dm | 2 +- html/changelogs/mattatlas-sousou.yml | 41 +++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/mattatlas-sousou.yml diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 9f143fada91..695e4db4843 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -55,7 +55,7 @@ if(!primary_reagent || reagent_volumes[primary_reagent] < vol) primary_reagent = R if(total_volume > maximum_volume) - remove_any(maximum_volume - total_volume) + remove_any(total_volume - maximum_volume) return max(total_volume,0) /datum/reagents/proc/update_holder(var/reactions = TRUE) diff --git a/html/changelogs/mattatlas-sousou.yml b/html/changelogs/mattatlas-sousou.yml new file mode 100644 index 00000000000..4056814d64b --- /dev/null +++ b/html/changelogs/mattatlas-sousou.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: MattAtlas + +# 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: "Fixed a server crashing bug with reagent transfer going into the negatives if a container ended up with more reagents than its total amount allowed."