cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 18:46:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

tgui usr to ui.user

Browse Source
This commit is contained in:
Kashargul
2024-11-13 00:49:17 +01:00
parent 49d89c0059
commit 32c9f971bc
120 changed files with 1037 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machinery/machine_processing.dm
+8 -8
View File
@@ -90,17 +90,17 @@
return data
/obj/machinery/mineral/processing_unit_console/tgui_act(action, list/params)
/obj/machinery/mineral/processing_unit_console/tgui_act(action, list/params, datum/tgui/ui)
if(..())
return TRUE
add_fingerprint(usr)
add_fingerprint(ui.user)
switch(action)
if("toggleSmelting")
var/ore = params["ore"]
var/new_setting = params["set"]
if(new_setting == null)
new_setting = tgui_input_list(usr, "What setting do you wish to use for processing [ore]]?", "Process Setting", list("Smelting","Compressing","Alloying","Nothing"))
new_setting = tgui_input_list(ui.user, "What setting do you wish to use for processing [ore]]?", "Process Setting", list("Smelting","Compressing","Alloying","Nothing"))
if(!new_setting)
return
switch(new_setting)
@@ -119,7 +119,7 @@
if("logoff")
if(!inserted_id)
return
usr.put_in_hands(inserted_id)
ui.user.put_in_hands(inserted_id)
inserted_id = null
. = TRUE
if("claim")
@@ -128,16 +128,16 @@
inserted_id.mining_points += machine.points
machine.points = 0
else
to_chat(usr, span_warning("Required access not found."))
to_chat(ui.user, span_warning("Required access not found."))
. = TRUE
if("insert")
var/obj/item/card/id/I = usr.get_active_hand()
var/obj/item/card/id/I = ui.user.get_active_hand()
if(istype(I))
usr.drop_item()
ui.user.drop_item()
I.forceMove(src)
inserted_id = I
else
to_chat(usr, span_warning("No valid ID."))
to_chat(ui.user, span_warning("No valid ID."))
. = TRUE
if("speed_toggle")
machine.toggle_speed()
code/modules/mining/machinery/machine_stacking.dm
+2 -2
View File
@@ -49,7 +49,7 @@
data["stackingAmt"] = machine.stack_amt
return data
/obj/machinery/mineral/stacking_unit_console/tgui_act(action, list/params)
/obj/machinery/mineral/stacking_unit_console/tgui_act(action, list/params, datum/tgui/ui)
if(..())
return TRUE
@@ -66,7 +66,7 @@
machine.stack_storage[stack] = 0
. = TRUE
add_fingerprint(usr)
add_fingerprint(ui.user)
/**********************Mineral stacking unit**************************/
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+3 -3
View File
@@ -257,7 +257,7 @@
ui.set_autoupdate(FALSE)
/obj/machinery/mineral/equipment_vendor/tgui_act(action, params)
/obj/machinery/mineral/equipment_vendor/tgui_act(action, params, datum/tgui/ui)
if(..())
return
@@ -266,7 +266,7 @@
if("logoff")
if(!inserted_id)
return
usr.put_in_hands(inserted_id)
ui.user.put_in_hands(inserted_id)
inserted_id = null
if("purchase")
if(!inserted_id)
@@ -279,7 +279,7 @@
return
var/datum/data/mining_equipment/prize = prize_list[category][name]
if(prize.cost > get_points(inserted_id)) // shouldn't be able to access this since the button is greyed out, but..
to_chat(usr, span_danger("You have insufficient points."))
to_chat(ui.user, span_danger("You have insufficient points."))
flick(icon_deny, src) //VOREStation Add
return