Merge branch 'master' into upstream-merge-13122

This commit is contained in:
Nadyr
2022-06-22 22:37:44 -04:00
committed by GitHub
397 changed files with 9458 additions and 7952 deletions

View File

@@ -130,7 +130,7 @@
if(istype(I, /obj/item/device/multitool))
if(panel_open)
var/input = sanitize(input(usr, "What id would you like to give this conveyor?", "Multitool-Conveyor interface", id))
var/input = sanitize(tgui_input_text(usr, "What id would you like to give this conveyor?", "Multitool-Conveyor interface", id))
if(!input)
to_chat(user, "No input found. Please hang up and try your call again.")
return
@@ -304,7 +304,7 @@
if(istype(I, /obj/item/device/multitool))
if(panel_open)
var/input = sanitize(input(usr, "What id would you like to give this conveyor switch?", "Multitool-Conveyor interface", id))
var/input = sanitize(tgui_input_text(usr, "What id would you like to give this conveyor switch?", "Multitool-Conveyor interface", id))
if(!input)
to_chat(user, "No input found. Please hang up and try your call again.")
return

View File

@@ -57,7 +57,7 @@
else
nameset = 1
if("Description")
var/str = sanitize(input(usr,"Label text?","Set label",""))
var/str = sanitize(tgui_input_text(usr,"Label text?","Set label",""))
if(!str || !length(str))
to_chat(user, "<font color='red'>Invalid text.</font>")
return
@@ -169,7 +169,7 @@
nameset = 1
if("Description")
var/str = sanitize(input(usr,"Label text?","Set label",""))
var/str = sanitize(tgui_input_text(usr,"Label text?","Set label",""))
if(!str || !length(str))
to_chat(user, "<font color='red'>Invalid text.</font>")
return