cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
ItsSelis
2022-06-18 14:57:51 +02:00
parent 0937f3a381
commit bb87687017
18 changed files with 134 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+4 -10
View File
@@ -3,17 +3,11 @@
req_access = list(access_kitchen)
starts_with = list(
<<<<<<< HEAD
/obj/item/weapon/reagent_containers/food/condiment/flour = 7,
/obj/item/weapon/reagent_containers/food/condiment/sugar = 2,
/obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6,
/obj/item/weapon/reagent_containers/food/condiment/carton/sugar = 1,
/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 1,
/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 1,
/obj/item/weapon/reagent_containers/food/condiment/spacespice = 2
=======
/obj/item/reagent_containers/food/condiment/carton/flour = 6,
/obj/item/reagent_containers/food/condiment/carton/sugar = 1,
/obj/item/reagent_containers/food/condiment/carton/flour/rustic = 1,
/obj/item/reagent_containers/food/condiment/carton/sugar/rustic = 1,
/obj/item/reagent_containers/food/condiment/spacespice = 2
>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
)
open_sound = 'sound/machines/click.ogg'