cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incoming mirror PR

Browse Source
This commit is contained in:
Rykka
2020-07-31 01:14:09 -04:00
parent ffbc61e37e
commit e8ebaee3dd
17 changed files with 8 additions and 1337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/food/kitchen/cooking_machines/_cooker.dm
View File

@@ -19,21 +19,12 @@
if(.) //no need to duplicate adjacency check
if(!stat)
if (temperature < min_temp)
<<<<<<< HEAD
to_chat(user, "<span class='warning'>\The [src] is still heating up and is too cold to cook anything yet.</span>")
else
to_chat(user, "<span class='notice'>It is running at [round(get_efficiency(), 0.1)]% efficiency!</span>")
to_chat(user, "Temperature: [round(temperature - T0C, 0.1)]C / [round(optimal_temp - T0C, 0.1)]C")
else
to_chat(user, "<span class='warning'>It is switched off.</span>")
=======
. += "<span class='warning'>\The [src] is still heating up and is too cold to cook anything yet.</span>"
else
. += "<span class='notice'>It is running at [round(get_efficiency(), 0.1)]% efficiency!</span>"
. += "Temperature: [round(temperature - T0C, 0.1)]C / [round(optimal_temp - T0C, 0.1)]C"
else
. += "<span class='warning'>It is switched off.</span>"
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
/obj/machinery/appliance/cooker/list_contents(var/mob/user)
if (cooking_objs.len)