cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update _appliance.dm

Browse Source
This commit is contained in:
Novacat
2020-09-21 13:54:02 -04:00
committed by GitHub
parent 68a37c64fa
commit 23d0b9a699
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,22 +319,13 @@
return return
//From here we can start cooking food //From here we can start cooking food
<<<<<<< HEAD
. = add_content(I, user)
=======
add_content(ToCook, user) add_content(ToCook, user)
>>>>>>> f518a31... Hydro upkeep (#7475)
update_icon() update_icon()
//Override for container mechanics //Override for container mechanics
/obj/machinery/appliance/proc/add_content(var/obj/item/I, var/mob/user) /obj/machinery/appliance/proc/add_content(var/obj/item/I, var/mob/user)
<<<<<<< HEAD
if(!user.unEquip(I))
return FALSE
=======
if(!user.unEquip(I) && !isturf(I.loc)) if(!user.unEquip(I) && !isturf(I.loc))
return return
>>>>>>> f518a31... Hydro upkeep (#7475)
var/datum/cooking_item/CI = has_space(I) var/datum/cooking_item/CI = has_space(I)
if (istype(I, /obj/item/weapon/reagent_containers/cooking_container) && CI == 1) if (istype(I, /obj/item/weapon/reagent_containers/cooking_container) && CI == 1)