diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 4c15e20d6e0..a909256b84a 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -47,9 +47,9 @@ return var/datum/reagent/master = reagents.get_master_reagent() - name = master.condiment_name || (reagents.reagent_list.len == 1) ? "master.condiment_name" : "condiment bottle" + name = master.condiment_name || (reagents.reagent_list.len == 1) ? "[master.condiment_name]" : "condiment bottle" // if no condiment_name, use generic bottle. master reagent names aren't used, because their capitalization doesn't play nice with grammar. - desc = master.condiment_desc ? "master.condiment_desc" : master.condiment_name ? "master.description" : (reagents.reagent_list.len == 1) ? "Looks like it is [reagents.get_master_reagent_name()], but you are not sure." : "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them." + desc = master.condiment_desc ? "[master.condiment_desc]" : master.condiment_name ? "[master.description]" : (reagents.reagent_list.len == 1) ? "Looks like it is [reagents.get_master_reagent_name()], but you are not sure." : "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them." // usually uses condiment_desc. if no condiment_desc, but there's a condiment_name, use reagent name as an interim. else use the generic bottle description. icon_state = master.condiment_icon_state || "mixedcondiments" center_of_mass = master.condiment_center_of_mass || list("x"=16, "y"=6) diff --git a/html/changelogs/fixes-condiment-names.yml b/html/changelogs/fixes-condiment-names.yml new file mode 100644 index 00000000000..91c5a52e134 --- /dev/null +++ b/html/changelogs/fixes-condiment-names.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: Arrow768 + +# 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: "Kitchen condiments are now named properly again."