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,19 +59,20 @@
 		if(hta_returns["to_update"])
 			to_update = hta_returns["to_update"]
 
-	if(!islist(touchable_mobs))
+	if(!LAZYLEN(touchable_mobs))
 		return
 
 ///////////////////// Early Non-Mode Handling /////////////////////
+	if(emote_active)
 		var/list/EL = emote_lists[digest_mode]
-	if(LAZYLEN(EL) && touchable_mobs && next_emote <= world.time && emote_active)
+		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/living_count = 0
-			for(var/mob/living/L in contents)
-				living_count++
 
 				var/raw_message = pick(EL)
 				var/formatted_message

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>