diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index da39fad98a5..345c84669b1 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -92,7 +92,10 @@ if(!current_bake_time) //Not baked yet if(positive_result) - examine_list += span_notice("[parent] can be baked into \a [initial(bake_result.name)].") + if(initial(bake_result.gender) == PLURAL) + examine_list += span_notice("[parent] can be [span_bold("baked")] into some [initial(bake_result.name)].") + else + examine_list += span_notice("[parent] can be [span_bold("baked")] into \a [initial(bake_result.name)].") return if(positive_result) diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index 515ed4f3dce..36d077ab057 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -99,7 +99,10 @@ if(!current_cook_time) //Not grilled yet if(positive_result) - examine_list += span_notice("[parent] can be grilled into \a [initial(cook_result.name)].") + if(initial(cook_result.name) == PLURAL) + examine_list += span_notice("[parent] can be [span_bold("grilled")] into some [initial(cook_result.name)].") + else + examine_list += span_notice("[parent] can be [span_bold("grilled")] into \a [initial(cook_result.name)].") return if(positive_result) diff --git a/code/datums/elements/food/microwavable.dm b/code/datums/elements/food/microwavable.dm index 437128a107c..6462825899c 100644 --- a/code/datums/elements/food/microwavable.dm +++ b/code/datums/elements/food/microwavable.dm @@ -72,4 +72,7 @@ /datum/element/microwavable/proc/on_examine(atom/source, mob/user, list/examine_list) SIGNAL_HANDLER - examine_list += span_notice("[source] could be microwaved into \a [initial(result_typepath.name)].") + if(initial(result_typepath.gender) == PLURAL) + examine_list += span_notice("[source] can be [span_bold("microwaved")] into some [initial(result_typepath.name)].") + else + examine_list += span_notice("[source] can be [span_bold("microwaved")] into \a [initial(result_typepath.name)].") diff --git a/code/datums/elements/food/processable.dm b/code/datums/elements/food/processable.dm index 2fd4e54a89b..81e31676070 100644 --- a/code/datums/elements/food/processable.dm +++ b/code/datums/elements/food/processable.dm @@ -57,10 +57,23 @@ /datum/element/processable/proc/OnExamine(atom/source, mob/user, list/examine_list) SIGNAL_HANDLER + var/result_name = initial(result_atom_type.name) + var/result_gender = initial(result_atom_type.gender) + var/tool_desc = tool_behaviour_name(tool_behaviour) + + // I admit, this is a lot of lines for very minor changes in the strings + // but at least it's readable? if(amount_created > 1) - examine_list += span_notice("It can be turned into [amount_created] [initial(result_atom_type.name)]s with [tool_behaviour_name(tool_behaviour)]!") + if(result_gender == PLURAL) + examine_list += span_notice("It can be turned into [amount_created] [result_name] with [span_bold(tool_desc)]!") + else + examine_list += span_notice("It can be turned into [amount_created] [result_name][plural_s(result_name)] with [span_bold(tool_desc)]!") + else - examine_list += span_notice("It can be turned into \a [initial(result_atom_type.name)] with [tool_behaviour_name(tool_behaviour)]!") + if(result_gender == PLURAL) + examine_list += span_notice("It can be turned into some [result_name] with [span_bold(tool_desc)]!") + else + examine_list += span_notice("It can be turned into \a [result_name] with [span_bold(tool_desc)]!") /** * Adds context sensitivy directly to the processable file for screentips diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 4fa7dc82039..a9ef302f7e7 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1536,7 +1536,7 @@ created_atom.pixel_x += rand(-8,8) created_atom.pixel_y += rand(-8,8) created_atom.OnCreatedFromProcessing(user, process_item, chosen_option, src) - to_chat(user, span_notice("You manage to create [chosen_option[TOOL_PROCESSING_AMOUNT]] [initial(atom_to_create.gender) == PLURAL ? "[initial(atom_to_create.name)]" : "[initial(atom_to_create.name)]\s"] from [src].")) + to_chat(user, span_notice("You manage to create [chosen_option[TOOL_PROCESSING_AMOUNT]] [initial(atom_to_create.gender) == PLURAL ? "[initial(atom_to_create.name)]" : "[initial(atom_to_create.name)][plural_s(initial(atom_to_create.name))]"] from [src].")) created_atoms.Add(created_atom) SEND_SIGNAL(src, COMSIG_ATOM_PROCESSED, user, process_item, created_atoms) UsedforProcessing(user, process_item, chosen_option)