cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14342 from neersighted/tgui_followup

Browse Source 
More tgui fixes and tweaks
This commit is contained in:
tkdrg
2016-01-04 18:39:52 -03:00
parent 04fcc515aa f021d1920a
commit c13a2f97e5
39 changed files with 242 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+4 -6
View File
@@ -88,7 +88,7 @@
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "chem_dispenser", name, 550, 700)
ui = new(user, src, ui_key, "chem_dispenser", name, 550, 550)
ui.open()
/obj/machinery/chem_dispenser/get_ui_data()
@@ -129,11 +129,9 @@
switch(action)
if("amount")
amount = round(text2num(params["amount"]), 5) // round to nearest 5
if (amount < 0) // Since the user can actually type the commands himself, some sanity checking
amount = 0
if (amount > 100)
amount = 100
var/amount = text2num(params["amount"])
if(amount in beaker.possible_transfer_amounts)
src.amount = amount
if("dispense")
if(beaker && dispensable_reagents.Find(params["reagent"]))
var/datum/reagents/R = beaker.reagents