From d64b2ae36a8130f848c662f8df1f10367a499eed Mon Sep 17 00:00:00 2001 From: Meatstuff <65227917+Meatstuff882@users.noreply.github.com> Date: Sat, 7 Sep 2024 19:53:37 -0700 Subject: [PATCH] resolves conflict probably. --- code/modules/fishing/datums/generic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/fishing/datums/generic.dm b/code/modules/fishing/datums/generic.dm index 4f9be08003..a1bb631a1c 100644 --- a/code/modules/fishing/datums/generic.dm +++ b/code/modules/fishing/datums/generic.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(fishing_loot_tables) /obj/item/reagent_container/food/snacks/fishable/crab ) var/list/rare_fishable_atoms = list( - /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito + /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito, /obj/item/coin/silver ) var/list/ultra_rare_fishable_atoms = list(