cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-06-23 00:20:31 -04:00
committed by GitHub
parent 07e82ab477
commit 897f3e23f6
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/tgui_input/alert.dm
View File

@@ -10,15 +10,7 @@
* * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout. * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout.
* * autofocus - The bool that controls if this alert should grab window focus. * * autofocus - The bool that controls if this alert should grab window focus.
*/ */
<<<<<<< refs/remotes/Upstream/master:code/modules/tgui_input/alert.dm
/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE)
=======
<<<<<<< HEAD:code/modules/tgui/tgui_alert.dm
/proc/tgui_alert(mob/user, message = null, title = null, list/buttons = list("Ok"), timeout = 0)
=======
/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, strict_byond = FALSE) /proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, strict_byond = FALSE)
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix:code/modules/tgui_input/alert.dm
>>>>>>> Input Fixes:code/modules/tgui/tgui_alert.dm
if (istext(buttons)) if (istext(buttons))
stack_trace("tgui_alert() received text for buttons instead of list") stack_trace("tgui_alert() received text for buttons instead of list")
return return
@@ -33,33 +25,19 @@
user = client.mob user = client.mob
else else
return return
<<<<<<< refs/remotes/Upstream/master:code/modules/tgui_input/alert.dm
=======
<<<<<<< HEAD:code/modules/tgui/tgui_alert.dm
var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout)
=======
>>>>>>> Input Fixes:code/modules/tgui/tgui_alert.dm
// A gentle nudge - you should not be using TGUI alert for anything other than a simple message. // A gentle nudge - you should not be using TGUI alert for anything other than a simple message.
if(length(buttons) > 3) if(length(buttons) > 3)
log_tgui(user, "Error: TGUI Alert initiated with too many buttons. Use a list.", "TguiAlert") log_tgui(user, "Error: TGUI Alert initiated with too many buttons. Use a list.", "TguiAlert")
return tgui_input_list(user, message, title, buttons, timeout, autofocus) return tgui_input_list(user, message, title, buttons, timeout, autofocus)
// Client does NOT have tgui_input on: Returns regular input // Client does NOT have tgui_input on: Returns regular input
<<<<<<< refs/remotes/Upstream/master:code/modules/tgui_input/alert.dm
if(!usr.client.prefs.tgui_input_mode)
=======
if(!usr.client.prefs.tgui_input_mode || strict_byond) if(!usr.client.prefs.tgui_input_mode || strict_byond)
>>>>>>> Input Fixes:code/modules/tgui/tgui_alert.dm
if(length(buttons) == 2) if(length(buttons) == 2)
return alert(user, message, title, buttons[1], buttons[2]) return alert(user, message, title, buttons[1], buttons[2])
if(length(buttons) == 3) if(length(buttons) == 3)
return alert(user, message, title, buttons[1], buttons[2], buttons[3]) return alert(user, message, title, buttons[1], buttons[2], buttons[3])
var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus) var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus)
<<<<<<< refs/remotes/Upstream/master:code/modules/tgui_input/alert.dm
=======
>>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix:code/modules/tgui_input/alert.dm
>>>>>>> Input Fixes:code/modules/tgui/tgui_alert.dm
alert.tgui_interact(user) alert.tgui_interact(user)
alert.wait() alert.wait()
if (alert) if (alert)