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

[MIRROR] ports tgui color input from bubbers (#9919)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-23 12:35:22 -07:00
committed by GitHub
parent 615ba5fdc7
commit fc21a0cb26
60 changed files with 1949 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/integrated_electronics/core/detailer.dm
View File

@@ -69,8 +69,8 @@
// Just uncomment this and get rid of all of the TGUI bullshit lol
// if(!in_range(user, src))
// return
// var/new_color = input(user, "Pick a color", "Color Selection", detail_color) as color|null
// var/new_color = tgui_color_picker(user, "Pick a color", "Color Selection", detail_color)
// if(!new_color)
// return
// detail_color = new_color
// update_icon()
// update_icon()

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

@@ -92,7 +92,7 @@
power_draw_per_use = 4
/obj/item/integrated_circuit/input/colorpad/ask_for_input(mob/user)
var/new_color = input(user, "Enter a color, please.", "Color pad", get_pin_data(IC_OUTPUT, 1)) as color|null
var/new_color = tgui_color_picker(user, "Enter a color, please.", "Color pad", get_pin_data(IC_OUTPUT, 1))
if(new_color && CanInteract(user, GLOB.tgui_physical_state))
set_pin_data(IC_OUTPUT, 1, new_color)
push_data()

24
code/modules/integrated_electronics/subtypes/z_mixed_ch.dm
View File

@@ -48,28 +48,6 @@
activate_pin(2)
return push_data()
//FIXES fr pads below because i dont want to edit the actual files, YES this removes checks for if user is close to the machine,, no they werent working anyway.
/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
if(istext(new_input))
set_pin_data(IC_OUTPUT, 1, new_input)
push_data()
activate_pin(1)
/obj/item/integrated_circuit/input/numberpad/ask_for_input(mob/user)
var/new_input = input(user, "Enter a number, please.","Number pad", get_pin_data(IC_OUTPUT, 1)) as null|num
if(isnum(new_input))
set_pin_data(IC_OUTPUT, 1, new_input)
push_data()
activate_pin(1)
/obj/item/integrated_circuit/input/colorpad/ask_for_input(mob/user)
var/new_color = input(user, "Enter a color, please.", "Color pad", get_pin_data(IC_OUTPUT, 1)) as color|null
if(new_color)
set_pin_data(IC_OUTPUT, 1, new_color)
push_data()
activate_pin(1)
//Racial addition for medscanner circuitry.
//Because if we die from water, probably shouldn't feed em protein shakes yknow or if you are an antag this can be useful info too
@@ -124,4 +102,4 @@
/obj/item/electronic_assembly/drone
w_class = ITEMSIZE_NORMAL
max_components = IC_COMPONENTS_BASE * 6
max_complexity = IC_COMPLEXITY_BASE * 6
max_complexity = IC_COMPLEXITY_BASE * 6