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

Merge branch 'master' into upstream-merge-13122

Browse Source
This commit is contained in:
Nadyr
2022-06-22 22:37:44 -04:00
committed by GitHub
parent b0802ce267 1b30469c6b
commit a2d9c8b58a
397 changed files with 9458 additions and 7952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/integrated_electronics/core/pins.dm
View File

@@ -154,7 +154,7 @@ list[](
var/new_data = null
switch(type_to_use)
if("string")
new_data = input(usr, "Now type in a string.","[src] string writing", istext(default) ? default : null) as null|text
new_data = tgui_input_text(usr, "Now type in a string.","[src] string writing", istext(default) ? default : null)
if(istext(new_data) && holder.check_interactivity(user) )
to_chat(user, "<span class='notice'>You input [new_data] into the pin.</span>")
return new_data

2
code/modules/integrated_electronics/core/special_pins/string_pin.dm
View File

@@ -3,7 +3,7 @@
name = "string pin"
/datum/integrated_io/string/ask_for_pin_data(mob/user)
var/new_data = input(usr, "Please type in a string.","[src] string writing") as null|text
var/new_data = tgui_input_text(usr, "Please type in a string.","[src] string writing")
new_data = sanitizeSafe(new_data, MAX_MESSAGE_LEN, 0, 0)
if(new_data && holder.check_interactivity(user) )

2
code/modules/integrated_electronics/core/tools.dm
View File

@@ -122,7 +122,7 @@
switch(type_to_use)
if("string")
accepting_refs = 0
new_data = input(usr, "Now type in a string.","[src] string writing") as null|text
new_data = tgui_input_text(usr, "Now type in a string.","[src] string writing")
new_data = sanitizeSafe(new_data, MAX_MESSAGE_LEN, 0, 0)
if(istext(new_data) && CanInteract(user, GLOB.tgui_physical_state))
data_to_write = new_data

2
code/modules/integrated_electronics/subtypes/input.dm
View File

@@ -72,7 +72,7 @@
power_draw_per_use = 4
/obj/item/integrated_circuit/input/textpad/ask_for_input(mob/user)
var/new_input = input(user, "Enter some words, please.","Number pad", get_pin_data(IC_OUTPUT, 1)) as null|text
var/new_input = tgui_input_text(user, "Enter some words, please.","Number pad", get_pin_data(IC_OUTPUT, 1))
if(istext(new_input) && CanInteract(user, GLOB.tgui_physical_state))
set_pin_data(IC_OUTPUT, 1, new_input)
push_data()

4
code/modules/integrated_electronics/subtypes/memory.dm
View File

@@ -96,13 +96,13 @@
switch(type_to_use)
if("string")
accepting_refs = 0
new_data = input(usr, "Now type in a string.","[src] string writing") as null|text
new_data = tgui_input_text(usr, "Now type in a string.","[src] string writing")
if(istext(new_data) && CanInteract(user, GLOB.tgui_physical_state))
O.data = new_data
to_chat(user, "<span class='notice'>You set \the [src]'s memory to [O.display_data(O.data)].</span>")
if("number")
accepting_refs = 0
new_data = input(usr, "Now type in a number.","[src] number writing") as null|num
new_data = tgui_input_number(usr, "Now type in a number.","[src] number writing")
if(isnum(new_data) && CanInteract(user, GLOB.tgui_physical_state))
O.data = new_data
to_chat(user, "<span class='notice'>You set \the [src]'s memory to [O.display_data(O.data)].</span>")