fix conflicts, but shutdown

continue rebase to master

code/modules/mob/living/carbon/human/life.dm

@@ -1591,9 +1591,9 @@
 
 		if(!isbelly(loc)) //VOREStation Add - Belly fullscreens safety
 			clear_fullscreen("belly")
-			clear_fullscreen("belly2")
+			//clear_fullscreen("belly2") //Chomp disable, using our own implementation 
-			clear_fullscreen("belly3")
+			//clear_fullscreen("belly3") //Chomp disable, using our own implementation 
-			clear_fullscreen("belly4")
+			//clear_fullscreen("belly4") //Chomp disable, using our own implementation 
 
 		if(config.welder_vision)
 			var/found_welder

code/modules/vore/eating/belly_obj_vr.dm

@@ -174,18 +174,13 @@
 	var/belly_fullscreen = ""
 	var/disable_hud = FALSE
 	var/colorization_enabled = TRUE //CHOMPedit
-	var/belly_fullscreen_color = "#823232"
+	var/belly_fullscreen_color = "#823232" //ChompEDIT
-<<<<<<< HEAD
+	var/belly_fullscreen_color2 = "#FFFFFF" //ChompEDIT
-	var/belly_fullscreen_color2 = "#FFFFFF"
+	var/belly_fullscreen_color3 = "#823232" //ChompEDIT
-	var/belly_fullscreen_color3 = "#823232"
+	var/belly_fullscreen_color4 = "#FFFFFF" //ChompEDIT
-	var/belly_fullscreen_color4 = "#FFFFFF"
+	var/belly_fullscreen_alpha = 255 //ChompEDIT
-	var/belly_fullscreen_alpha = 255
+	//var/belly_fullscreen_color_secondary = "#428242" //Chomp Disable, using our implementation
-
+	//var/belly_fullscreen_color_trinary = "#f0f0f0" //Chomp Disable, using our implementation
-
-=======
-	var/belly_fullscreen_color_secondary = "#428242"
-	var/belly_fullscreen_color_trinary = "#f0f0f0"
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 
 //For serialization, keep this updated, required for bellies to save correctly.
 /obj/belly/vars_to_save()
@@ -248,15 +243,12 @@
 	"disable_hud",
 	"reagent_mode_flags",	//CHOMP start of variables from CHOMP
 	"belly_fullscreen_color",
-<<<<<<< HEAD
+	//"belly_fullscreen_color_secondary",  //Chomp Disable, using our implementation
+	//"belly_fullscreen_color_trinary",  //Chomp Disable, using our implementation
 	"belly_fullscreen_color2",
 	"belly_fullscreen_color3",
 	"belly_fullscreen_color4",
 	"belly_fullscreen_alpha",
-=======
-	"belly_fullscreen_color_secondary",
-	"belly_fullscreen_color_trinary",
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 	"colorization_enabled",
 	"reagentbellymode",
 	"liquid_fullness1_messages",
@@ -487,7 +479,24 @@
 		L.clear_fullscreen("belly")
 	if(belly_fullscreen)
 		if(colorization_enabled)
-<<<<<<< HEAD
+			/* //Chomp Disable - disable upstream's solution, use ours
+			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/colorized)
+			F.icon_state = belly_fullscreen
+			F.color = belly_fullscreen_color
+			if("[belly_fullscreen]_l1" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
+				var/obj/screen/fullscreen/F2 = L.overlay_fullscreen("belly2", /obj/screen/fullscreen/belly/colorized/overlay)
+				F2.icon_state = "[belly_fullscreen]_l1"
+				F2.color = belly_fullscreen_color_secondary
+			if("[belly_fullscreen]_l2" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
+				var/obj/screen/fullscreen/F3 = L.overlay_fullscreen("belly3", /obj/screen/fullscreen/belly/colorized/overlay)
+				F3.icon_state = "[belly_fullscreen]_l2"
+				F3.color = belly_fullscreen_color_trinary
+			if("[belly_fullscreen]_nc" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
+				var/obj/screen/fullscreen/F4 = L.overlay_fullscreen("belly4", /obj/screen/fullscreen/belly/colorized/overlay)
+				F4.icon_state = "[belly_fullscreen]_nc"
+			*/ //Chomp Disable END
+			
+			// Chomp EDIT Begin
 			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly, severity) //CHOMPEdit Start: preserving save data
 			F.icon = file("modular_chomp/icons/mob/vore_fullscreens/[belly_fullscreen].dmi")
 			F.cut_overlays()
@@ -517,22 +526,6 @@
 				I.pixel_y = -450 + (450 / custom_max_volume * reagents.total_volume)
 				F.add_overlay(I)
 			F.update_for_view(L.client.view)
-=======
-			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/colorized)
-			F.icon_state = belly_fullscreen
-			F.color = belly_fullscreen_color
-			if("[belly_fullscreen]_l1" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
-				var/obj/screen/fullscreen/F2 = L.overlay_fullscreen("belly2", /obj/screen/fullscreen/belly/colorized/overlay)
-				F2.icon_state = "[belly_fullscreen]_l1"
-				F2.color = belly_fullscreen_color_secondary
-			if("[belly_fullscreen]_l2" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
-				var/obj/screen/fullscreen/F3 = L.overlay_fullscreen("belly3", /obj/screen/fullscreen/belly/colorized/overlay)
-				F3.icon_state = "[belly_fullscreen]_l2"
-				F3.color = belly_fullscreen_color_trinary
-			if("[belly_fullscreen]_nc" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
-				var/obj/screen/fullscreen/F4 = L.overlay_fullscreen("belly4", /obj/screen/fullscreen/belly/colorized/overlay)
-				F4.icon_state = "[belly_fullscreen]_nc"
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 		else
 			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/fixed, severity) //preserving save data
 			F.icon = file("modular_chomp/icons/mob/vore_fullscreens/[belly_fullscreen].dmi")
@@ -555,12 +548,9 @@
 			 //CHOMPEdit End
 	else
 		L.clear_fullscreen("belly")
-<<<<<<< HEAD
+		//L.clear_fullscreen("belly2") //Chomp Disable - disable upstream's solution, use ours
-=======
+		//L.clear_fullscreen("belly3") //Chomp Disable - disable upstream's solution, use ours
-		L.clear_fullscreen("belly2")
+		//L.clear_fullscreen("belly4") //Chomp Disable - disable upstream's solution, use ours
-		L.clear_fullscreen("belly3")
-		L.clear_fullscreen("belly4")
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 
 	if(disable_hud)
 		if(L?.hud_used?.hud_shown)
@@ -574,8 +564,24 @@
 		return
 	if(belly_fullscreen)
 		if(colorization_enabled)
-<<<<<<< HEAD
+			/* //Chomp Disable - disable upstream's solution, use ours
-			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly, reagents.total_volume) //CHOMPedit Start: preserving save data
+			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/colorized)
+			F.icon_state = belly_fullscreen
+			F.color = belly_fullscreen_color
+			if("[belly_fullscreen]_l1" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
+				var/obj/screen/fullscreen/F2 = L.overlay_fullscreen("belly2", /obj/screen/fullscreen/belly/colorized/overlay)
+				F2.icon_state = "[belly_fullscreen]_l1"
+				F2.color = belly_fullscreen_color_secondary
+			if("[belly_fullscreen]_l2" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
+				var/obj/screen/fullscreen/F3 = L.overlay_fullscreen("belly3", /obj/screen/fullscreen/belly/colorized/overlay)
+				F3.icon_state = "[belly_fullscreen]_l2"
+				F3.color = belly_fullscreen_color_trinary
+			if("[belly_fullscreen]_nc" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
+				var/obj/screen/fullscreen/F4 = L.overlay_fullscreen("belly4", /obj/screen/fullscreen/belly/colorized/overlay)
+				F4.icon_state = "[belly_fullscreen]_nc"
+			*/ //Chomp Disable END
+			//CHOMPedit Start: preserving save data
+			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly, reagents.total_volume) 
 			F.icon = file("modular_chomp/icons/mob/vore_fullscreens/[belly_fullscreen].dmi")
 			F.cut_overlays()
 			var/image/I = image(F.icon, belly_fullscreen)
@@ -604,22 +610,6 @@
 				I.pixel_y = -450 + (450 / custom_max_volume * reagents.total_volume)
 				F.add_overlay(I)
 			F.update_for_view(L.client.view)
-=======
-			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/colorized)
-			F.icon_state = belly_fullscreen
-			F.color = belly_fullscreen_color
-			if("[belly_fullscreen]_l1" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
-				var/obj/screen/fullscreen/F2 = L.overlay_fullscreen("belly2", /obj/screen/fullscreen/belly/colorized/overlay)
-				F2.icon_state = "[belly_fullscreen]_l1"
-				F2.color = belly_fullscreen_color_secondary
-			if("[belly_fullscreen]_l2" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
-				var/obj/screen/fullscreen/F3 = L.overlay_fullscreen("belly3", /obj/screen/fullscreen/belly/colorized/overlay)
-				F3.icon_state = "[belly_fullscreen]_l2"
-				F3.color = belly_fullscreen_color_trinary
-			if("[belly_fullscreen]_nc" in icon_states('icons/mob/screen_full_colorized_vore_overlays.dmi'))
-				var/obj/screen/fullscreen/F4 = L.overlay_fullscreen("belly4", /obj/screen/fullscreen/belly/colorized/overlay)
-				F4.icon_state = "[belly_fullscreen]_nc"
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 		else
 			var/obj/screen/fullscreen/F = L.overlay_fullscreen("belly", /obj/screen/fullscreen/belly/fixed, reagents.total_volume) //preserving save data
 			F.cut_overlays()
@@ -637,21 +627,19 @@
 				I.alpha = max(150, min(custom_max_volume, 255)) - (255 - belly_fullscreen_alpha)
 				I.pixel_y = -450 + (450 / custom_max_volume * reagents.total_volume)
 				F.add_overlay(I)
-			F.update_for_view(L.client.view)//CHOMPEdit End
+			F.update_for_view(L.client.view)
+			//CHOMPEdit End
 	else
 		L.clear_fullscreen("belly")
-<<<<<<< HEAD
+		//L.clear_fullscreen("belly2") //Chomp Disable - disable upstream's solution, use ours
-=======
+		//L.clear_fullscreen("belly3") //Chomp Disable - disable upstream's solution, use ours
-		L.clear_fullscreen("belly2")
+		//L.clear_fullscreen("belly4") //Chomp Disable - disable upstream's solution, use ours
-		L.clear_fullscreen("belly3")
-		L.clear_fullscreen("belly4")
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 
 /obj/belly/proc/clear_preview(mob/living/L)
 	L.clear_fullscreen("belly")
-	L.clear_fullscreen("belly2")
+	//L.clear_fullscreen("belly2") //Chomp Disable - disable upstream's solution, use ours
-	L.clear_fullscreen("belly3")
+	//L.clear_fullscreen("belly3") //Chomp Disable - disable upstream's solution, use ours
-	L.clear_fullscreen("belly4")
+	//L.clear_fullscreen("belly4") //Chomp Disable - disable upstream's solution, use ours
 
 
 
@@ -1630,12 +1618,9 @@
 
 	dupe.belly_fullscreen = belly_fullscreen
 	dupe.disable_hud = disable_hud
-<<<<<<< HEAD
-=======
 	dupe.belly_fullscreen_color = belly_fullscreen_color
-	dupe.belly_fullscreen_color_secondary = belly_fullscreen_color_secondary
+	//dupe.belly_fullscreen_color_secondary = belly_fullscreen_color_secondary //Chomp Disable - Use our solution, not upstream's
-	dupe.belly_fullscreen_color_trinary = belly_fullscreen_color_trinary
+	//dupe.belly_fullscreen_color_trinary = belly_fullscreen_color_trinary //Chomp Disable - Use our solution, not upstream's
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 	dupe.colorization_enabled = colorization_enabled
 	dupe.egg_type = egg_type
 	dupe.emote_time = emote_time

code/modules/vore/eating/living_vr.dm

@@ -1173,8 +1173,10 @@
 	icon = 'icons/mob/screen_full_vore.dmi' //CHOMPedit: tweaking to preserve save data
 	icon_state = ""
 
+/* //Chomp DISABLE - use our solution, not upstream's.
 /obj/screen/fullscreen/belly/colorized/overlay
 	icon = 'icons/mob/screen_full_colorized_vore_overlays.dmi'
+*/ //Chomp DISABLE End
 
 /mob/living/proc/vorebelly_printout() //Spew the vorepanel belly messages into chat window for copypasting.
 	set name = "X-Print Vorebelly Settings"

code/modules/vore/eating/vorepanel_vr.dm

@@ -8,11 +8,13 @@
 #define BELLIES_DESC_MAX 4096
 #define FLAVOR_MAX 400
 
+/* //Chomp REMOVE - Use our solution, not upstream's
 //INSERT COLORIZE-ONLY STOMACHS HERE
 var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 														"a_synth_flesh_mono_hole",
 														"a_anim_belly",
 														"multi_layer_test_tummy")
+*/ //Chomp REMOVE End
 
 /mob/living
 	var/datum/vore_look/vorePanel
@@ -225,15 +227,13 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 			"override_min_prey_num"	= selected.override_min_prey_num,
 			//CHOMP add: vore sprite options and additional stuff
 			"belly_fullscreen_color" = selected.belly_fullscreen_color,
-<<<<<<< HEAD
+			//"belly_fullscreen_color_secondary" = selected.belly_fullscreen_color_secondary, // Chomp REMOVE - use our solution, not upstream's
+			//"belly_fullscreen_color_trinary" = selected.belly_fullscreen_color_trinary, // Chomp REMOVE - use our solution, not upstream's
+			//CHOMP add: vore sprite options and additional stuff
 			"belly_fullscreen_color2" = selected.belly_fullscreen_color2,
 			"belly_fullscreen_color3" = selected.belly_fullscreen_color3,
 			"belly_fullscreen_color4" = selected.belly_fullscreen_color4,
 			"belly_fullscreen_alpha" = selected.belly_fullscreen_alpha,
-=======
-			"belly_fullscreen_color_secondary" = selected.belly_fullscreen_color_secondary,
-			"belly_fullscreen_color_trinary" = selected.belly_fullscreen_color_trinary,
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 			"colorization_enabled" = selected.colorization_enabled,
 			"vorespawn_blacklist" = selected.vorespawn_blacklist,
 			"sound_volume" = selected.sound_volume,
@@ -310,15 +310,12 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 		selected_list["disable_hud"] = selected.disable_hud
 		selected_list["colorization_enabled"] = selected.colorization_enabled
 		selected_list["belly_fullscreen_color"] = selected.belly_fullscreen_color
-<<<<<<< HEAD
+		//selected_list["belly_fullscreen_color_secondary"] = selected.belly_fullscreen_color_secondary // Chomp REMOVE - use our solution, not upstream's
-		selected_list["belly_fullscreen_color2"] = selected.belly_fullscreen_color2
+		//selected_list["belly_fullscreen_color_trinary"] = selected.belly_fullscreen_color_trinary // Chomp REMOVE - use our solution, not upstream's
-		selected_list["belly_fullscreen_color3"] = selected.belly_fullscreen_color3
+		selected_list["belly_fullscreen_color2"] = selected.belly_fullscreen_color2 //CHOMPAdd
-		selected_list["belly_fullscreen_color4"] = selected.belly_fullscreen_color4
+		selected_list["belly_fullscreen_color3"] = selected.belly_fullscreen_color3 //CHOMPAdd
-		selected_list["belly_fullscreen_alpha"] = selected.belly_fullscreen_alpha
+		selected_list["belly_fullscreen_color4"] = selected.belly_fullscreen_color4 //CHOMPAdd
-=======
+		selected_list["belly_fullscreen_alpha"] = selected.belly_fullscreen_alpha //CHOMPAdd
-		selected_list["belly_fullscreen_color_secondary"] = selected.belly_fullscreen_color_secondary
-		selected_list["belly_fullscreen_color_trinary"] = selected.belly_fullscreen_color_trinary
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 
 		if(selected.colorization_enabled)
 			selected_list["possible_fullscreens"] = icon_states('modular_chomp/icons/mob/screen_full_vore_ch.dmi') //Makes any icons inside of here selectable. //CHOMPedit
@@ -330,7 +327,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 			//Why? I have no flipping clue. As you can see above, vore_colorized is included in the assets but isn't working. It makes no sense.
 			//I can only imagine this is a BYOND/TGUI issue with the cache. If you can figure out how to fix this and make it so you only need to
 			//include things in full_colorized_vore, that would be great. For now, this is the only workaround that I could get to work.
-			selected_list["possible_fullscreens"] -= belly_colorable_only_fullscreens
+			//selected_list["possible_fullscreens"] -= belly_colorable_only_fullscreens // Chomp REMOVE - use our solution, not upstream's
 
 		var/list/selected_contents = list()
 		for(var/O in selected)
@@ -1508,16 +1505,11 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 				B.vore_fx(host, TRUE)
 			else
 				host.clear_fullscreen("belly")
-<<<<<<< HEAD
+				//host.clear_fullscreen("belly2") //Chomp REMOVE - use our solution, not upstream's
+				//host.clear_fullscreen("belly3") //Chomp REMOVE - use our solution, not upstream's
+				//host.clear_fullscreen("belly4") //Chomp REMOVE - use our solution, not upstream's
 			if(!host.hud_used.hud_shown)
 				host.toggle_hud_vis()
-=======
-				host.clear_fullscreen("belly2")
-				host.clear_fullscreen("belly3")
-				host.clear_fullscreen("belly4")
-				if(!host.hud_used.hud_shown)
-					host.toggle_hud_vis()
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
 			unsaved_changes = TRUE
 			return TRUE
 		if("toggle_noisy")
@@ -2678,6 +2670,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 				host.vore_selected.belly_fullscreen_alpha = newalpha
 				host.vore_selected.update_internal_overlay()
 			. = TRUE
+		/* //Chomp REMOVE - use our solution, not upstream's
 		if("b_fullscreen_color_secondary")
 			var/newcolor = input(usr, "Choose a color.", "", host.vore_selected.belly_fullscreen_color) as color|null
 			if(newcolor)
@@ -2688,6 +2681,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 			if(newcolor)
 				host.vore_selected.belly_fullscreen_color_trinary = newcolor
 			. = TRUE
+		*/ //Chomp REMOVE - use our solution, not upstream's
 		if("b_save_digest_mode")
 			host.vore_selected.save_digest_mode = !host.vore_selected.save_digest_mode
 			. = TRUE

tgui/packages/tgui/interfaces/VorePanel.js

@@ -1062,15 +1062,8 @@ const VoreSelectedBellyVisuals = (props, context) => {
   const {
     belly_fullscreen,
     belly_fullscreen_color,
-<<<<<<< HEAD
-    belly_fullscreen_color2,
-    belly_fullscreen_color3,
-    belly_fullscreen_color4,
-    belly_fullscreen_alpha,
-=======
     belly_fullscreen_color_secondary,
     belly_fullscreen_color_trinary,
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
     mapRef,
     colorization_enabled,
     possible_fullscreens,
@@ -1297,27 +1290,6 @@ const VoreSelectedBellyVisuals = (props, context) => {
             back_color={belly_fullscreen_color}
             name_of="1"
           />
-<<<<<<< HEAD
-          <FeatureColorInput
-            action_name="b_fullscreen_color2"
-            value_of={null}
-            back_color={belly_fullscreen_color2}
-            name_of="2"
-          />
-          <FeatureColorInput
-            action_name="b_fullscreen_color3"
-            value_of={null}
-            back_color={belly_fullscreen_color3}
-            name_of="3"
-          />
-          <FeatureColorInput
-            action_name="b_fullscreen_color4"
-            value_of={null}
-            back_color={belly_fullscreen_color4}
-            name_of="4"
-          />
-          <FeatureColorInput action_name="b_fullscreen_alpha" value_of={null} back_color="#FFFFFF" name_of="Alpha" />
-=======
           <Button
             icon="eye-dropper"
             onClick={() =>
@@ -1358,7 +1330,6 @@ const VoreSelectedBellyVisuals = (props, context) => {
             }>
             Select Trinary Color
           </Button>
->>>>>>> e84eeb62cd... Merge pull request #15037 from Heroman3003/multi_layer_overlays
           <LabeledList.Item label="Enable Coloration">
             <Button
               onClick={() =>