Skip to content

Commit

Permalink
resolves conflict
Browse files Browse the repository at this point in the history
probably.
  • Loading branch information
Meatstuff882 committed Sep 8, 2024
1 parent 2ed1f0d commit d64b2ae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/fishing/datums/generic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit d64b2ae

Please sign in to comment.