cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 15:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

ports tgui color input from bubbers (#16934)

Browse Source 
* ports tgui color input from monkeystation

* .

* push that real quick

* .

* .

* cleanup

* fix for 516

* port bubbers pre set selection

* also this

* allow 20 saved states

* oups

* regex replace

* urg

* use the update by type

* .

* .

* highlight?

* larger?

* fix those

* keep anyone below 516 on old style
This commit is contained in:
Kashargul
2025-01-21 18:27:45 -05:00
committed by GitHub
parent 7266c4c5dc
commit c0e339b1ea
56 changed files with 1913 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/vorepanel_vr.dm
+8 -8
View File
@@ -676,7 +676,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
if("set_vs_color")
var/belly_choice = tgui_input_list(ui.user, "Which vore sprite are you going to edit the color of?", "Vore Sprite Color", host.vore_icon_bellies)
if(belly_choice)
var/newcolor = input(ui.user, "Choose a color.", "", host.vore_sprite_color[belly_choice]) as color|null
var/newcolor = tgui_color_picker(ui.user, "Choose a color.", "", host.vore_sprite_color[belly_choice])
if(newcolor)
host.vore_sprite_color[belly_choice] = newcolor
var/multiply = tgui_input_list(ui.user, "Set the color to be applied multiplicatively or additively? Currently in [host.vore_sprite_multiply[belly_choice] ? "Multiply" : "Add"]", "Vore Sprite Color", list("Multiply", "Add"))
@@ -1724,17 +1724,17 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.clear_preview(host) //Clears the stomach overlay. This is a failsafe but shouldn't occur.
. = TRUE
if("b_fullscreen_color")
var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color) as color|null
var/newcolor = tgui_color_picker(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color)
if(newcolor)
host.vore_selected.belly_fullscreen_color = newcolor
. = TRUE
if("b_fullscreen_color_secondary")
var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_secondary) as color|null
var/newcolor = tgui_color_picker(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_secondary)
if(newcolor)
host.vore_selected.belly_fullscreen_color_secondary = newcolor
. = TRUE
if("b_fullscreen_color_trinary")
var/newcolor = input(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_trinary) as color|null
var/newcolor = tgui_color_picker(user, "Choose a color.", "", host.vore_selected.belly_fullscreen_color_trinary)
if(newcolor)
host.vore_selected.belly_fullscreen_color_trinary = newcolor
. = TRUE
@@ -1867,7 +1867,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.update_fullness()
host.updateVRPanel()
if("b_undergarment_color")
var/newcolor = input(user, "Choose a color.", "", host.vore_selected.undergarment_color) as color|null
var/newcolor = tgui_color_picker(user, "Choose a color.", "", host.vore_selected.undergarment_color)
if(newcolor)
host.vore_selected.undergarment_color = newcolor
host.update_fullness()
@@ -1880,17 +1880,17 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.vore_selected.tail_to_change_to = tail_choice
. = TRUE
if("b_tail_color")
var/newcolor = input(user, "Choose tail color.", "", host.vore_selected.tail_colouration) as color|null
var/newcolor = tgui_color_picker(user, "Choose tail color.", "", host.vore_selected.tail_colouration)
if(newcolor)
host.vore_selected.tail_colouration = newcolor
. = TRUE
if("b_tail_color2")
var/newcolor = input(user, "Choose tail secondary color.", "", host.vore_selected.tail_extra_overlay) as color|null
var/newcolor = tgui_color_picker(user, "Choose tail secondary color.", "", host.vore_selected.tail_extra_overlay)
if(newcolor)
host.vore_selected.tail_extra_overlay = newcolor
. = TRUE
if("b_tail_color3")
var/newcolor = input(user, "Choose tail tertiary color.", "", host.vore_selected.tail_extra_overlay2) as color|null
var/newcolor = tgui_color_picker(user, "Choose tail tertiary color.", "", host.vore_selected.tail_extra_overlay2)
if(newcolor)
host.vore_selected.tail_extra_overlay2 = newcolor
. = TRUE
code/modules/vore/smoleworld/smoleworld_vr.dm
+2 -2
View File
@@ -147,7 +147,7 @@
set src in oview(1)
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
return
var/new_color = input(usr, "Please select color.", "Paint Color", color) as color|null
var/new_color = tgui_color_picker(usr, "Please select color.", "Paint Color", color)
color = new_color
return
@@ -307,7 +307,7 @@
set src in oview(1)
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
return
var/new_color = input(usr, "Please select color.", "Paint Color", color) as color|null
var/new_color = tgui_color_picker(usr, "Please select color.", "Paint Color", color)
color = new_color
return