cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update oven.dm

Browse Source
This commit is contained in:
Novacat
2021-02-06 20:52:35 -05:00
committed by GitHub
parent 94a1966f3a
commit 2a7bb0dceb
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/food/kitchen/cooking_machines/oven.dm
View File

@@ -104,11 +104,7 @@
cooking = FALSE
playsound(src, 'sound/machines/hatch_open.ogg', 20, 1)
<<<<<<< HEAD
to_chat(user, "<span class='notice'>You [open ? "open" : "close"] the oven door.</span>")
=======
to_chat(user, "<span class='notice'>You [open? "open":"close"] the oven door</span>")
>>>>>>> 65f48cd... Merge pull request #7845 from Cerebulon/foodfixes
update_icon()
/obj/machinery/appliance/cooker/oven/proc/manip(var/obj/item/I)
@@ -156,4 +152,4 @@
combination_cook(CI)
return
else
..()
..()