diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 3291c6ace34..75ce599728d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -45,7 +45,7 @@ /datum/gear/flask/New() ..() - gear_tweaks += new /datum/gear_tweak/reagents(lunchables_alcohol_reagents()) + gear_tweaks += new /datum/gear_tweak/reagents(lunchables_all_drink_reagents()) /datum/gear/vacflask_cold display_name = "cold vacuum-flask" @@ -53,7 +53,7 @@ /datum/gear/vacflask_cold/New() ..() - gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) + gear_tweaks += new /datum/gear_tweak/reagents(lunchables_all_drink_reagents()) /datum/gear/vacflask_cold/spawn_item(var/location, var/metadata) . = ..() @@ -67,7 +67,7 @@ /datum/gear/vacflask_hot/New() ..() - gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) + gear_tweaks += new /datum/gear_tweak/reagents(lunchables_all_drink_reagents()) /datum/gear/vacflask_hot/spawn_item(var/location, var/metadata) . = ..() diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 1cf10f193da..1bee9d518e0 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -141,6 +141,9 @@ var/list/lunchables_alcohol_reagents_ = list( lunchables_alcohol_reagents_ = init_lunchable_reagent_list(lunchables_alcohol_reagents_, /decl/reagent/alcohol) return lunchables_alcohol_reagents_ +/proc/lunchables_all_drink_reagents() + return sortList(lunchables_drink_reagents() + lunchables_alcohol_reagents()) + /proc/init_lunchable_list(var/list/lunches) . = list() for(var/lunch in lunches) diff --git a/html/changelogs/example copy.yml b/html/changelogs/example copy.yml new file mode 100644 index 00000000000..700165e94f2 --- /dev/null +++ b/html/changelogs/example copy.yml @@ -0,0 +1,6 @@ +author: Sparky_hotdog + +delete-after: True + +changes: + - tweak: "All types of flask in the loadout can now start with any reagent."