cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 19:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes invalid condiment names (#9730)

Browse Source
This commit is contained in:
Werner
2020-08-21 00:39:12 +02:00
committed by GitHub
parent 4bc389483a
commit d4f7ec98fa
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/condiment.dm
+2 -2
View File
@@ -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)