Fixed conflicts. Adds water bottle to the machine coz logic.

This commit is contained in:
Ketrai
2020-01-07 23:07:50 +01:00
parent 9112a9a2b6
commit c8531c827f
3 changed files with 4 additions and 186 deletions

View File

@@ -394,7 +394,7 @@
icon_state = "sharkmeat_chunk"
nutriment_amt = 15
w_class = ITEMSIZE_LARGE
slice_path = /obj/item/weapon/reagent_containers/food/snacks/sharkmeat
slice_path = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
slices_num = 5
/obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize()