diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 491da12a81..806fbc1f90 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -142,55 +142,8 @@
user.set_machine(src)
interact(user)
-/*******************
-* SmartFridge Menu
-********************/
-/obj/machinery/smartfridge/interact(mob/user)
- if(stat)
- return FALSE
-<<<<<<< HEAD
- var/dat = "Select an item:
"
-
- if (contents.len == 0)
- dat += "No product loaded!"
- else
- var/listofitems = list()
- for (var/atom/movable/O in contents)
- if (listofitems[O.name])
- listofitems[O.name]++
- else
- listofitems[O.name] = 1
- sortList(listofitems)
-
- for (var/O in listofitems)
- if(listofitems[O] <= 0)
- continue
- var/N = listofitems[O]
- var/itemName = url_encode(O)
- dat += "[capitalize(O)]:"
- dat += " [N] "
- dat += "Vend "
- if(N > 5)
- dat += "(x5)"
- if(N > 10)
- dat += "(x10)"
- if(N > 25)
- dat += "(x25)"
- if(N > 1)
- dat += "(All)"
-
- dat += "
"
-
- dat += ""
- user << browse("[src] supplies[dat]", "window=smartfridge")
- onclose(user, "smartfridge")
- return dat
-
-/obj/machinery/smartfridge/Topic(var/href, var/list/href_list)
- if(..())
-=======
/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
@@ -222,23 +175,27 @@
/obj/machinery/smartfridge/ui_act(action, params)
. = ..()
if(.)
->>>>>>> 5f6b2a9... Merge pull request #30519 from vuonojenmustaturska/smartfridges2electricboogaloo
return
- usr.set_machine(src)
+ switch(action)
+ if("Release")
+ var/desired = 0
- var/N = href_list["vend"]
- var/amount = text2num(href_list["amount"])
+ if (params["amount"])
+ desired = text2num(params["amount"])
+ else
+ desired = input("How many items?", "How many items would you like to take out?", 1) as null|num
- var/i = amount
- for(var/obj/O in contents)
- if(i <= 0)
- break
- if(O.name == N)
- O.loc = src.loc
- i--
+ if(QDELETED(src) || QDELETED(usr) || !usr.Adjacent(src)) // Sanity checkin' in case stupid stuff happens while we wait for input()
+ return FALSE
-
- updateUsrDialog()
+ for(var/obj/item/O in src)
+ if(desired <= 0)
+ break
+ if(O.name == params["name"])
+ O.forceMove(drop_location())
+ desired--
+ return TRUE
+ return FALSE
// ----------------------------
@@ -274,22 +231,6 @@
/obj/machinery/smartfridge/drying_rack/default_deconstruction_crowbar(obj/item/crowbar/C, ignore_panel = 1)
..()
-<<<<<<< HEAD
-/obj/machinery/smartfridge/drying_rack/interact(mob/user)
- var/dat = ..()
- if(dat)
- dat += "
"
- dat += "Toggle Drying "
- user << browse("[src] supplies[dat]", "window=smartfridge")
- onclose(user, "smartfridge")
-
-/obj/machinery/smartfridge/drying_rack/Topic(href, list/href_list)
- ..()
- if(href_list["dry"])
- toggle_drying(FALSE)
- updateUsrDialog()
- update_icon()
-=======
/obj/machinery/smartfridge/drying_rack/ui_data(mob/user)
. = ..()
.["isdryer"] = TRUE
@@ -307,7 +248,6 @@
toggle_drying(FALSE)
return TRUE
return FALSE
->>>>>>> 5f6b2a9... Merge pull request #30519 from vuonojenmustaturska/smartfridges2electricboogaloo
/obj/machinery/smartfridge/drying_rack/power_change()
if(powered() && anchored)