diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 68034a0ff6f..fe61303fce5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -89,7 +89,7 @@ lunchboxes[initial(lunchbox.name)] = lunchbox_type sortTim(lunchboxes, /proc/cmp_text_asc) gear_tweaks += new/datum/gear_tweak/path(lunchboxes) - gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks()) + gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks(), lunchables_utensil()) /datum/gear/banner display_name = "banner selection" diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 7d014a7a29b..5fe850ad668 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -14,7 +14,8 @@ var/list/lunchables_lunches_ = list( /obj/item/reagent_containers/food/snacks/koiswaffles, /obj/item/reagent_containers/food/snacks/funnelcake, /obj/item/reagent_containers/food/snacks/hotdog, - /obj/item/reagent_containers/food/snacks/tajaran_bread + /obj/item/reagent_containers/food/snacks/tajaran_bread, + /obj/item/reagent_containers/food/snacks/soup/earthenroot ) var/list/lunchables_snacks_ = list( @@ -49,7 +50,9 @@ var/list/lunchables_snacks_ = list( /obj/item/reagent_containers/food/snacks/meatsnack, /obj/item/reagent_containers/food/snacks/maps, /obj/item/reagent_containers/food/snacks/nathisnack, - /obj/item/reagent_containers/food/snacks/adhomian_can + /obj/item/reagent_containers/food/snacks/adhomian_can, + /obj/item/reagent_containers/food/snacks/adhomian_sausage, + /obj/item/reagent_containers/food/snacks/chocolatebar ) var/list/lunchables_drinks_ = list( @@ -69,6 +72,14 @@ var/list/lunchables_drinks_ = list( /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda ) +var/list/lunchables_utensil_ = list( + /obj/item/material/kitchen/utensil/fork/chopsticks, + /obj/item/material/kitchen/utensil/fork/chopsticks/cheap, + /obj/item/material/kitchen/utensil/fork/plastic, + /obj/item/material/kitchen/utensil/spoon/plastic, + /obj/item/material/kitchen/utensil/knife/plastic +) + // This default list is a bit different, it contains items we don't want var/list/lunchables_drink_reagents_ = list( /decl/reagent/drink/nothing, @@ -112,6 +123,11 @@ var/list/lunchables_alcohol_reagents_ = list( lunchables_drinks_ = init_lunchable_list(lunchables_drinks_) return lunchables_drinks_ +/proc/lunchables_utensil() + if(!(lunchables_utensil_[lunchables_utensil_[1]])) + lunchables_utensil_ = init_lunchable_list(lunchables_utensil_) + return lunchables_utensil_ + /proc/lunchables_drink_reagents() if(!(lunchables_drink_reagents_[lunchables_drink_reagents_[1]])) lunchables_drink_reagents_ = init_lunchable_reagent_list(lunchables_drink_reagents_, /decl/reagent/drink) diff --git a/html/changelogs/LunchboxUtensil.yml b/html/changelogs/LunchboxUtensil.yml new file mode 100644 index 00000000000..d4f2fcd0dc7 --- /dev/null +++ b/html/changelogs/LunchboxUtensil.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "Added earthenroot soup, adhomian sausages & chocolate bars to the lunchbox options and additionally they can now also spawn with a single utensil of choice."