mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Added fourth colour
This commit is contained in:
@@ -168,6 +168,7 @@
|
|||||||
var/belly_fullscreen_color = "#823232"
|
var/belly_fullscreen_color = "#823232"
|
||||||
var/belly_fullscreen_color2 = "#823232"
|
var/belly_fullscreen_color2 = "#823232"
|
||||||
var/belly_fullscreen_color3 = "#823232"
|
var/belly_fullscreen_color3 = "#823232"
|
||||||
|
var/belly_fullscreen_color4 = "#823232"
|
||||||
var/belly_fullscreen_alpha = 255
|
var/belly_fullscreen_alpha = 255
|
||||||
|
|
||||||
|
|
||||||
@@ -235,6 +236,7 @@
|
|||||||
"belly_fullscreen_color",
|
"belly_fullscreen_color",
|
||||||
"belly_fullscreen_color2",
|
"belly_fullscreen_color2",
|
||||||
"belly_fullscreen_color3",
|
"belly_fullscreen_color3",
|
||||||
|
"belly_fullscreen_color4",
|
||||||
"belly_fullscreen_alpha",
|
"belly_fullscreen_alpha",
|
||||||
"colorization_enabled",
|
"colorization_enabled",
|
||||||
"reagentbellymode",
|
"reagentbellymode",
|
||||||
@@ -434,7 +436,7 @@
|
|||||||
if(belly_fullscreen)
|
if(belly_fullscreen)
|
||||||
if(colorization_enabled)
|
if(colorization_enabled)
|
||||||
var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly) //CHOMPedit: preserving save data
|
var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly) //CHOMPedit: preserving save data
|
||||||
var/image/I = image(F.icon, belly_fullscreen) //Would be cool if I could just include color and alpha in the image define
|
var/image/I = image(F.icon, belly_fullscreen) //Would be cool if I could just include color and alpha in the image define so we don't have to copy paste
|
||||||
I.color = belly_fullscreen_color
|
I.color = belly_fullscreen_color
|
||||||
I.alpha = belly_fullscreen_alpha
|
I.alpha = belly_fullscreen_alpha
|
||||||
F.add_overlay(I)
|
F.add_overlay(I)
|
||||||
@@ -446,11 +448,16 @@
|
|||||||
I.color = belly_fullscreen_color3
|
I.color = belly_fullscreen_color3
|
||||||
I.alpha = belly_fullscreen_alpha
|
I.alpha = belly_fullscreen_alpha
|
||||||
F.add_overlay(I)
|
F.add_overlay(I)
|
||||||
|
I = image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-4")
|
||||||
|
I.color = belly_fullscreen_color4
|
||||||
|
I.alpha = belly_fullscreen_alpha
|
||||||
|
F.add_overlay(I)
|
||||||
else
|
else
|
||||||
var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/fixed) //CHOMPedit: preserving save data
|
var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/fixed) //CHOMPedit: preserving save data
|
||||||
F.add_overlay(image(F.icon, belly_fullscreen))
|
F.add_overlay(image(F.icon, belly_fullscreen))
|
||||||
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-2"))
|
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-2"))
|
||||||
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-3"))
|
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-3"))
|
||||||
|
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-4"))
|
||||||
else
|
else
|
||||||
L.clear_fullscreen("belly")
|
L.clear_fullscreen("belly")
|
||||||
|
|
||||||
@@ -480,11 +487,16 @@
|
|||||||
I.color = belly_fullscreen_color3
|
I.color = belly_fullscreen_color3
|
||||||
I.alpha = belly_fullscreen_alpha
|
I.alpha = belly_fullscreen_alpha
|
||||||
F.add_overlay(I)
|
F.add_overlay(I)
|
||||||
|
I = image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-4")
|
||||||
|
I.color = belly_fullscreen_color4
|
||||||
|
I.alpha = belly_fullscreen_alpha
|
||||||
|
F.add_overlay(I)
|
||||||
else
|
else
|
||||||
var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/fixed) //CHOMPedit: preserving save data
|
var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/fixed) //CHOMPedit: preserving save data
|
||||||
F.add_overlay(image(F.icon, belly_fullscreen))
|
F.add_overlay(image(F.icon, belly_fullscreen))
|
||||||
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-2"))
|
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-2"))
|
||||||
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-3"))
|
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-3"))
|
||||||
|
F.add_overlay(image('modular_chomp/icons/mob/screen_full_vore_ch_overlays.dmi', belly_fullscreen+"-4"))
|
||||||
else
|
else
|
||||||
L.clear_fullscreen("belly")
|
L.clear_fullscreen("belly")
|
||||||
|
|
||||||
@@ -1377,6 +1389,7 @@
|
|||||||
dupe.belly_fullscreen_color = belly_fullscreen_color
|
dupe.belly_fullscreen_color = belly_fullscreen_color
|
||||||
dupe.belly_fullscreen_color2 = belly_fullscreen_color2
|
dupe.belly_fullscreen_color2 = belly_fullscreen_color2
|
||||||
dupe.belly_fullscreen_color3 = belly_fullscreen_color3
|
dupe.belly_fullscreen_color3 = belly_fullscreen_color3
|
||||||
|
dupe.belly_fullscreen_color4 = belly_fullscreen_color4
|
||||||
dupe.belly_fullscreen_alpha = belly_fullscreen_alpha
|
dupe.belly_fullscreen_alpha = belly_fullscreen_alpha
|
||||||
dupe.reagentbellymode = reagentbellymode
|
dupe.reagentbellymode = reagentbellymode
|
||||||
dupe.vorefootsteps_sounds = vorefootsteps_sounds
|
dupe.vorefootsteps_sounds = vorefootsteps_sounds
|
||||||
|
|||||||
@@ -214,7 +214,7 @@
|
|||||||
L.Weaken(5)
|
L.Weaken(5)
|
||||||
|
|
||||||
// Fullscreen overlays
|
// Fullscreen overlays
|
||||||
//vore_fx(L) //Don't update this every single process tick, damn.
|
//vore_fx(L) //CHOMPEdit - Don't update this every single process tick, damn.
|
||||||
|
|
||||||
//Handle 'human'
|
//Handle 'human'
|
||||||
if(ishuman(L))
|
if(ishuman(L))
|
||||||
|
|||||||
@@ -202,6 +202,7 @@
|
|||||||
"belly_fullscreen_color" = selected.belly_fullscreen_color,
|
"belly_fullscreen_color" = selected.belly_fullscreen_color,
|
||||||
"belly_fullscreen_color2" = selected.belly_fullscreen_color2,
|
"belly_fullscreen_color2" = selected.belly_fullscreen_color2,
|
||||||
"belly_fullscreen_color3" = selected.belly_fullscreen_color3,
|
"belly_fullscreen_color3" = selected.belly_fullscreen_color3,
|
||||||
|
"belly_fullscreen_color4" = selected.belly_fullscreen_color4,
|
||||||
"belly_fullscreen_alpha" = selected.belly_fullscreen_alpha,
|
"belly_fullscreen_alpha" = selected.belly_fullscreen_alpha,
|
||||||
"colorization_enabled" = selected.colorization_enabled,
|
"colorization_enabled" = selected.colorization_enabled,
|
||||||
"vorespawn_blacklist" = selected.vorespawn_blacklist,
|
"vorespawn_blacklist" = selected.vorespawn_blacklist,
|
||||||
@@ -276,6 +277,7 @@
|
|||||||
selected_list["belly_fullscreen_color"] = selected.belly_fullscreen_color
|
selected_list["belly_fullscreen_color"] = selected.belly_fullscreen_color
|
||||||
selected_list["belly_fullscreen_color2"] = selected.belly_fullscreen_color2
|
selected_list["belly_fullscreen_color2"] = selected.belly_fullscreen_color2
|
||||||
selected_list["belly_fullscreen_color3"] = selected.belly_fullscreen_color3
|
selected_list["belly_fullscreen_color3"] = selected.belly_fullscreen_color3
|
||||||
|
selected_list["belly_fullscreen_color4"] = selected.belly_fullscreen_color4
|
||||||
selected_list["belly_fullscreen_alpha"] = selected.belly_fullscreen_alpha
|
selected_list["belly_fullscreen_alpha"] = selected.belly_fullscreen_alpha
|
||||||
|
|
||||||
if(selected.colorization_enabled)
|
if(selected.colorization_enabled)
|
||||||
@@ -1688,6 +1690,12 @@
|
|||||||
host.vore_selected.belly_fullscreen_color3 = newcolor3
|
host.vore_selected.belly_fullscreen_color3 = newcolor3
|
||||||
host.vore_selected.update_internal_overlay()
|
host.vore_selected.update_internal_overlay()
|
||||||
. = TRUE
|
. = TRUE
|
||||||
|
if("b_fullscreen_color4")
|
||||||
|
var/newcolor4 = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color4) as color|null
|
||||||
|
if(newcolor4)
|
||||||
|
host.vore_selected.belly_fullscreen_color4 = newcolor4
|
||||||
|
host.vore_selected.update_internal_overlay()
|
||||||
|
. = TRUE
|
||||||
if("b_fullscreen_alpha")
|
if("b_fullscreen_alpha")
|
||||||
var/newalpha = tgui_input_number(usr, "Set alpha transparency between 0-255", "Protean Armor",0,255,0,0,1)
|
var/newalpha = tgui_input_number(usr, "Set alpha transparency between 0-255", "Protean Armor",0,255,0,0,1)
|
||||||
if(newalpha)
|
if(newalpha)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 MiB After Width: | Height: | Size: 6.8 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.4 MiB |
@@ -796,6 +796,7 @@ const VoreSelectedBellyVisuals = (props, context) => {
|
|||||||
belly_fullscreen_color,
|
belly_fullscreen_color,
|
||||||
belly_fullscreen_color2,
|
belly_fullscreen_color2,
|
||||||
belly_fullscreen_color3,
|
belly_fullscreen_color3,
|
||||||
|
belly_fullscreen_color4,
|
||||||
belly_fullscreen_alpha,
|
belly_fullscreen_alpha,
|
||||||
mapRef,
|
mapRef,
|
||||||
colorization_enabled,
|
colorization_enabled,
|
||||||
@@ -956,6 +957,12 @@ const VoreSelectedBellyVisuals = (props, context) => {
|
|||||||
onClick={() => act('set_attribute', { attribute: 'b_fullscreen_color3', val: null })}>
|
onClick={() => act('set_attribute', { attribute: 'b_fullscreen_color3', val: null })}>
|
||||||
Select Color 3
|
Select Color 3
|
||||||
</Button>
|
</Button>
|
||||||
|
<Box backgroundColor={belly_fullscreen_color4} width="20px" height="20px" />
|
||||||
|
<Button
|
||||||
|
icon="eye-dropper"
|
||||||
|
onClick={() => act('set_attribute', { attribute: 'b_fullscreen_color4', val: null })}>
|
||||||
|
Select Color 4
|
||||||
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
icon="eye-dropper"
|
icon="eye-dropper"
|
||||||
onClick={() => act('set_attribute', { attribute: 'b_fullscreen_alpha', val: null })}>
|
onClick={() => act('set_attribute', { attribute: 'b_fullscreen_alpha', val: null })}>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user