tgui tank dispensers

code/game/objects/structures/tank_dispenser.dm

@@ -1,3 +1,5 @@
+#define TANK_DISPENSER_CAPACITY 10
+
 /obj/structure/dispenser
 	name = "tank storage unit"
 	desc = "A simple yet bulky storage device for gas tanks. Has room for up to ten oxygen tanks, and ten plasma tanks."
@@ -5,11 +7,8 @@
 	icon_state = "dispenser"
 	density = 1
 	anchored = 1
-	var/oxygentanks = 10
-	var/plasmatanks = 10
-	var/list/oxytanks = list()	//sorry for the similar var names
-	var/list/platanks = list()
-
+	var/oxygentanks = TANK_DISPENSER_CAPACITY
+	var/plasmatanks = TANK_DISPENSER_CAPACITY
 
 /obj/structure/dispenser/oxygen
 	plasmatanks = 0
@@ -17,92 +16,78 @@
 /obj/structure/dispenser/plasma
 	oxygentanks = 0
 
-
 /obj/structure/dispenser/New()
+	for(var/i in 1 to oxygentanks)
+		new /obj/item/weapon/tank/internals/oxygen(src)
+	for(var/i in 1 to plasmatanks)
+		new /obj/item/weapon/tank/internals/plasma(src)
 	update_icon()
 
-
 /obj/structure/dispenser/update_icon()
 	overlays.Cut()
 	switch(oxygentanks)
-		if(1 to 3)	overlays += "oxygen-[oxygentanks]"
-		if(4 to INFINITY) overlays += "oxygen-4"
+		if(1 to 3)
+			overlays += "oxygen-[oxygentanks]"
+		if(4 to TANK_DISPENSER_CAPACITY)
+			overlays += "oxygen-4"
 	switch(plasmatanks)
-		if(1 to 4)	overlays += "plasma-[plasmatanks]"
-		if(5 to INFINITY) overlays += "plasma-5"
-
-/obj/structure/dispenser/attack_paw(mob/user)
-	return src.attack_hand(user)
-
-/obj/structure/dispenser/attack_hand(mob/user)
-	if(!user.IsAdvancedToolUser())
-		user << "<span class='warning'>You don't have the dexterity to do this!</span>"
-		return 1
-	user.set_machine(src)
-	var/dat = "[src]<br><br>"
-	dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "<A href='?src=\ref[src];oxygen=1'>Dispense</A>" : "empty"]<br>"
-	dat += "Plasma tanks: [plasmatanks] - [plasmatanks ? "<A href='?src=\ref[src];plasma=1'>Dispense</A>" : "empty"]"
-	user << browse(dat, "window=dispenser")
-	onclose(user, "dispenser")
-	return
-
+		if(1 to 4)
+			overlays += "plasma-[plasmatanks]"
+		if(5 to TANK_DISPENSER_CAPACITY)
+			overlays += "plasma-5"
 
 /obj/structure/dispenser/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/tank/internals/oxygen) || istype(I, /obj/item/weapon/tank/internals/air) || istype(I, /obj/item/weapon/tank/internals/anesthetic))
-		if(oxygentanks < 10)
-			if(!user.drop_item())
-				return
-			I.loc = src
-			oxytanks.Add(I)
-			oxygentanks++
-			user << "<span class='notice'>You put [I] in [src].</span>"
-		else
-			user << "<span class='notice'>[src] is full.</span>"
+	var/full
 	if(istype(I, /obj/item/weapon/tank/internals/plasma))
-		if(plasmatanks < 10)
-			if(!user.drop_item())
-				return
-			I.loc = src
-			platanks.Add(I)
+		if(plasmatanks < TANK_DISPENSER_CAPACITY)
 			plasmatanks++
-			user << "<span class='notice'>You put [I] in [src].</span>"
 		else
-			user << "<span class='notice'>[src] is full.</span>"
-	updateUsrDialog()
-
-
-/obj/structure/dispenser/Topic(href, href_list)
-	if(usr.stat || usr.restrained())
-		return
-	if(Adjacent(usr))
-		usr.set_machine(src)
-		if(href_list["oxygen"])
-			if(oxygentanks > 0)
-				var/obj/item/weapon/tank/internals/oxygen/O
-				if(oxytanks.len == oxygentanks)
-					O = oxytanks[1]
-					oxytanks.Remove(O)
-				else
-					O = new /obj/item/weapon/tank/internals/oxygen(loc)
-				O.loc = loc
-				usr << "<span class='notice'>You take [O] out of [src].</span>"
-				oxygentanks--
-				update_icon()
-		if(href_list["plasma"])
-			if(plasmatanks > 0)
-				var/obj/item/weapon/tank/internals/plasma/P
-				if(platanks.len == plasmatanks)
-					P = platanks[1]
-					platanks.Remove(P)
-				else
-					P = new /obj/item/weapon/tank/internals/plasma(loc)
-				P.loc = loc
-				usr << "<span class='notice'>You take [P] out of [src].</span>"
-				plasmatanks--
-				update_icon()
-		add_fingerprint(usr)
-		updateUsrDialog()
+			full = TRUE
+	else if(istype(I, /obj/item/weapon/tank/internals/oxygen))
+		if(oxygentanks < TANK_DISPENSER_CAPACITY)
+			oxygentanks++
+		else
+			full = TRUE
 	else
-		usr << browse(null, "window=dispenser")
+		user << "<span class='notice'>[I] does not fit into [src].</span>"
 		return
-	return
+	if(full)
+		user << "<span class='notice'>[src] can't hold anymore of [I].</span>"
+		return
+
+	if(!user.drop_item())
+		return
+	I.loc = src
+	user << "<span class='notice'>You put [I] in [src].</span>"
+
+/obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
+										datum/tgui/master_ui = null, datum/ui_state/state = physical_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "tank_dispenser", name, 275, 100, master_ui, state)
+		ui.open()
+
+/obj/structure/dispenser/get_ui_data(mob/user)
+	var/list/data = list()
+	data["oxygen"] = oxygentanks
+	data["plasma"] = plasmatanks
+
+	return data
+
+/obj/structure/dispenser/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("plasma")
+			var/obj/item/weapon/tank/internals/plasma/tank = locate() in src
+			if(tank && usr.put_in_any_hand_if_possible(tank))
+				plasmatanks--
+			. = TRUE
+		if("oxygen")
+			var/obj/item/weapon/tank/internals/oxygen/tank = locate() in src
+			if(tank && usr.put_in_any_hand_if_possible(tank))
+				oxygentanks--
+			. = TRUE
+	update_icon()
+
+#undef TANK_DISPENSER_CAPACITY