From c34b0abfac25660da63151bcaccaf960171f7355 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Thu, 9 Feb 2017 06:59:05 -0500
Subject: [PATCH] Drying Rack Toggling Uses NanoUI and Other Fixes

---
 .../kitchen_machinery/smartfridge.dm          | 57 ++++++++++++-------
 nano/templates/smartfridge.tmpl               | 10 ++++
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 3c694f993cf..936b9e30827 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -20,6 +20,8 @@
 	var/locked = 0
 	var/scan_id = 1
 	var/is_secure = 0
+	var/can_dry = FALSE
+	var/drying = FALSE
 	var/datum/wires/smartfridge/wires = null
 
 /obj/machinery/smartfridge/New()
@@ -195,7 +197,7 @@
 
 /obj/machinery/smartfridge/default_deconstruction_screwdriver(mob/user, obj/item/weapon/screwdriver/S)
 	. = ..(user, icon_state, icon_state, S)
-	
+
 	overlays.Cut()
 	if(panel_open)
 		overlays += image(icon, "[initial(icon_state)]-panel")
@@ -332,6 +334,8 @@
 	data["shoot_inventory"] = shoot_inventory
 	data["locked"] = locked
 	data["secure"] = is_secure
+	data["can_dry"] = can_dry
+	data["drying"] = drying
 
 	var/list/items[0]
 	for(var/i=1 to length(item_quants))
@@ -372,6 +376,7 @@
 			for(var/obj/O in contents)
 				if(O.name == K)
 					O.forceMove(loc)
+					update_icon()
 					i--
 					if(i <= 0)
 						return 1
@@ -394,6 +399,7 @@
 			if(T.name == O)
 				T.forceMove(loc)
 				throw_item = T
+				update_icon()
 				break
 		break
 	if(!throw_item)
@@ -416,7 +422,7 @@
 	active_power_usage = 200
 	icon_on = "drying_rack_on"
 	icon_off = "drying_rack"
-	var/drying = FALSE
+	can_dry = TRUE
 
 /obj/machinery/smartfridge/drying_rack/New()
 	..()
@@ -443,6 +449,22 @@
 /obj/machinery/smartfridge/drying_rack/default_deconstruction_crowbar(obj/item/weapon/crowbar/C, ignore_panel = 1)
 	..()
 
+/obj/machinery/smartfridge/drying_rack/Topic(href, href_list)
+	if(..())
+		return 1
+	if(href_list["dryingOn"])
+		drying = TRUE
+		use_power = 2
+		update_icon()
+		return 1
+
+	if(href_list["dryingOff"])
+		drying = FALSE
+		use_power = 1
+		update_icon()
+		return 1
+	return 0
+
 /obj/machinery/smartfridge/drying_rack/power_change()
 	if(powered() && anchored)
 		stat &= ~NOPOWER
@@ -451,9 +473,10 @@
 		toggle_drying(TRUE)
 	update_icon()
 
-/obj/machinery/smartfridge/drying_rack/load() //For updating the filled overlay
-	..()
-	update_icon()
+/obj/machinery/smartfridge/drying_rack/load(obj/I, mob/user) //For updating the filled overlay
+	if(..())
+		update_icon()
+		return 1
 
 /obj/machinery/smartfridge/drying_rack/update_icon()
 	..()
@@ -470,11 +493,11 @@
 			update_icon()
 
 /obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
-	if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/))
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks))
 		var/obj/item/weapon/reagent_containers/food/snacks/S = O
 		if(S.dried_type)
 			return TRUE
-	if(istype(O,/obj/item/stack/sheet/wetleather/))
+	if(istype(O, /obj/item/stack/sheet/wetleather))
 		return TRUE
 	return FALSE
 
@@ -492,16 +515,21 @@
 		if(S.dried_type == S.type)//if the dried type is the same as the object's type, don't bother creating a whole new item...
 			S.color = "#ad7257"
 			S.dry = TRUE
+			item_quants[S.name]--
 			S.forceMove(get_turf(src))
 		else
 			var/dried = S.dried_type
 			new dried(loc)
+			item_quants[S.name]--
 			qdel(S)
+		nanomanager.update_uis(src)
 		return TRUE
 	for(var/obj/item/stack/sheet/wetleather/WL in contents)
 		var/obj/item/stack/sheet/leather/L = new(loc)
 		L.amount = WL.amount
+		item_quants[WL.name]--
 		qdel(WL)
+		nanomanager.update_uis(src)
 		return TRUE
 	return FALSE
 
@@ -509,21 +537,6 @@
 	..()
 	atmos_spawn_air(SPAWN_HEAT)
 
-/obj/machinery/smartfridge/drying_rack/verb/adjust_drying()
-	set category = "Object"
-	set name = "Toggle Drying"
-	set src in view(1)
-
-	if(!iscarbon(usr))
-		to_chat(usr, "<span class='warning'>You can't do that!</span>")
-		return
-
-	if(usr.incapacitated())
-		return
-
-	toggle_drying(FALSE)
-	update_icon()
-
 /************************
 *   Secure SmartFridges
 *************************/
diff --git a/nano/templates/smartfridge.tmpl b/nano/templates/smartfridge.tmpl
index 873487454dc..3c59892486d 100644
--- a/nano/templates/smartfridge.tmpl
+++ b/nano/templates/smartfridge.tmpl
@@ -10,6 +10,16 @@
     </span>
   {{/if}}
 </div>
+<div class="item">
+  {{if data.can_dry}}
+	<div class="itemLabel" style="width: 70%">
+		Drying:
+	</div>
+	<div class="itemContent" style="width: 30%;">
+		{{:helper.link('On', 'power-off', {'dryingOn' : 1}, data.drying ? 'selected' : null)}}{{:helper.link('Off', 'close', {'dryingOff' : 1}, data.drying ? null : 'selected')}}
+	</div>
+  {{/if}}
+</div>
 <div class='item'>
   {{if data.contents}}
     {{for data.contents}}