Vore fixes

code/_helpers/global_lists.dm

@@ -244,7 +244,7 @@ GLOBAL_LIST_EMPTY(mannequins)
 		wing_styles_list[path] = instance
 
 	// VOREStation Add - Vore Modes!
-	paths = subtypesof(/datum/digest_mode)
+	paths = typesof(/datum/digest_mode)
 	for(var/T in paths)
 		var/datum/digest_mode/DM = new T
 		GLOB.digest_modes[DM.id] = DM

code/modules/vore/eating/bellymodes_vr.dm

@@ -9,7 +9,15 @@
 			qdel(src)
 			return
 
+<<<<<<< HEAD
 	HandleBellyReagents()	//CHOMP reagent belly stuff, here to jam it into subsystems and avoid too much cpu usage
+||||||| parent of f3c583b740... Merge pull request #10930 from VOREStation/Arokha/ntvore
+=======
+	// VERY early exit
+	if(!contents.len)
+		return
+
+>>>>>>> f3c583b740... Merge pull request #10930 from VOREStation/Arokha/ntvore
 	var/play_sound //Potential sound to play at the end to avoid code duplication.
 	var/to_update = FALSE //Did anything update worthy happen?
 
@@ -51,28 +59,29 @@
 		if(hta_returns["to_update"])
 			to_update = hta_returns["to_update"]
 
-	if(!islist(touchable_mobs))
+	if(!LAZYLEN(touchable_mobs))
 		return
 
 ///////////////////// Early Non-Mode Handling /////////////////////
-	var/list/EL = emote_lists[digest_mode]
-	if(LAZYLEN(EL) && touchable_mobs && next_emote <= world.time && emote_active)
-		next_emote = world.time + (emote_time SECONDS)
-		for(var/mob/living/M in contents)
-			if(digest_mode == DM_DIGEST && !M.digestable)
-				continue // don't give digesty messages to indigestible people
+	if(emote_active)
+		var/list/EL = emote_lists[digest_mode]
+		if(LAZYLEN(EL) && next_emote <= world.time)
 			var/living_count = 0
 			for(var/mob/living/L in contents)
 				living_count++
+			next_emote = world.time + (emote_time SECONDS)
+			for(var/mob/living/M in contents)
+				if(digest_mode == DM_DIGEST && !M.digestable)
+					continue // don't give digesty messages to indigestible people
 
-			var/raw_message = pick(EL)
-			var/formatted_message
-			formatted_message = replacetext(raw_message, "%belly", lowertext(name))
-			formatted_message = replacetext(formatted_message, "%pred", owner)
-			formatted_message = replacetext(formatted_message, "%prey", english_list(contents))
-			formatted_message = replacetext(formatted_message, "%count", contents.len)
-			formatted_message = replacetext(formatted_message, "%countprey", living_count)
-			to_chat(M, "<span class='notice'>[formatted_message]</span>")
+				var/raw_message = pick(EL)
+				var/formatted_message
+				formatted_message = replacetext(raw_message, "%belly", lowertext(name))
+				formatted_message = replacetext(formatted_message, "%pred", owner)
+				formatted_message = replacetext(formatted_message, "%prey", english_list(contents))
+				formatted_message = replacetext(formatted_message, "%count", contents.len)
+				formatted_message = replacetext(formatted_message, "%countprey", living_count)
+				to_chat(M, "<span class='notice'>[formatted_message]</span>")
 
 	if(!digestion_noise_chance)
 		digestion_noise_chance = DM.noise_chance

code/modules/vore/eating/vorepanel_vr.dm

@@ -59,9 +59,15 @@
 /datum/vore_look/tgui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
+<<<<<<< HEAD
 		update_preview_icon()	//CHOMPEdit
 		give_client_previews(user.client) //CHOMPEdit
 		ui = new(user, src, "VorePanel", "Inside!")
+||||||| parent of f3c583b740... Merge pull request #10930 from VOREStation/Arokha/ntvore
+		ui = new(user, src, "VorePanel", "Inside!")
+=======
+		ui = new(user, src, "VorePanel", "Vore Panel")
+>>>>>>> f3c583b740... Merge pull request #10930 from VOREStation/Arokha/ntvore
 		ui.open()
 
 // This looks weird, but all tgui_host is used for is state checking

tgui/packages/tgui/interfaces/VorePanel.js

@@ -172,7 +172,13 @@ const digestModeToPreyMode = {
 export const VorePanel = (props, context) => {
   const { act, data } = useBackend(context);
   return (
+<<<<<<< HEAD
     <Window width={700} height={800} resizable>
+||||||| parent of f3c583b740... Merge pull request #10930 from VOREStation/Arokha/ntvore
+    <Window width={700} height={660} resizable>
+=======
+    <Window width={700} height={660} theme="abstract" resizable>
+>>>>>>> f3c583b740... Merge pull request #10930 from VOREStation/Arokha/ntvore
       <Window.Content scrollable>
         {data.unsaved_changes && (
           <NoticeBox danger>
@@ -1108,7 +1114,7 @@ const VoreUserPreferences = (props, context) => {
             selected={step_mechanics_active}
             fluid
             tooltipPosition="top"
-            tooltip={step_mechanics_active 
+            tooltip={step_mechanics_active
               ? "This setting controls whether or not you participate in size-based step mechanics."
               + "Includes both stepping on others, as well as getting stepped on. Click to disable step mechanics."
               : ("You will not participate in step mechanics."
@@ -1122,7 +1128,7 @@ const VoreUserPreferences = (props, context) => {
             selected={show_vore_fx}
             fluid
             tooltipPosition="top"
-            tooltip={show_vore_fx 
+            tooltip={show_vore_fx
               ? "This setting controls whether or not a pred is allowed to mess with your HUD and fullscreen overlays."
               + "Click to disable all FX."
               : ("Regardless of Predator Setting, you will not see their FX settings."
@@ -1136,7 +1142,7 @@ const VoreUserPreferences = (props, context) => {
             selected={digest_leave_remains}
             fluid
             tooltipPosition="top"
-            tooltip={digest_leave_remains 
+            tooltip={digest_leave_remains
               ? "Your Predator must have this setting enabled in their belly modes to allow remains to show up,"
               + "if they do not, they will not leave your remains behind, even with this on. Click to disable remains"
               : ("Regardless of Predator Setting, you will not leave remains behind."
@@ -1150,7 +1156,7 @@ const VoreUserPreferences = (props, context) => {
             selected={pickup_mechanics_active}
             fluid
             tooltipPosition="top"
-            tooltip={pickup_mechanics_active 
+            tooltip={pickup_mechanics_active
               ? "Allows macros to pick you up into their hands, and you to pick up micros."
               + "Click to disable pick-up mechanics"
               : ("You will not participate in pick-up mechanics."