From afd142bd6a4606410e71f1c226fa1323df4793a4 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Wed, 7 Jul 2021 15:03:32 -0400
Subject: [PATCH] Merge pull request #10945 from VOREStation/Arokha/fixes333

4 fixes
---
 code/modules/mob/living/carbon/brain/brain.dm | 6 ++++++
 code/modules/organs/subtypes/machine.dm       | 2 +-
 code/modules/overmap/bluespace_rift_vr.dm     | 2 +-
 code/modules/vore/eating/belly_obj_vr.dm      | 8 +++-----
 code/modules/vore/eating/living_vr.dm         | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 89ff4151fb..66bf9133ec 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -45,6 +45,12 @@
 /mob/living/carbon/brain/isSynthetic()
 	return istype(loc, /obj/item/device/mmi)
 
+/mob/living/carbon/brain/runechat_holder(datum/chatmessage/CM)
+	if(isturf(loc))
+		return ..()
+		
+	return loc
+
 /mob/living/carbon/brain/set_typing_indicator(var/state)
 	if(isturf(loc))
 		return ..()
diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm
index 01b0abdc61..9a64c70cb0 100644
--- a/code/modules/organs/subtypes/machine.dm
+++ b/code/modules/organs/subtypes/machine.dm
@@ -95,7 +95,7 @@
 
 	if(stored_mmi)
 		. = stored_mmi //VOREStation Code
-		stored_mmi.loc = get_turf(src)
+		stored_mmi.forceMove(drop_location())
 		if(owner.mind)
 			owner.mind.transfer_to(stored_mmi.brainmob)
 	..()
diff --git a/code/modules/overmap/bluespace_rift_vr.dm b/code/modules/overmap/bluespace_rift_vr.dm
index e38ed55d41..2964dd5b7a 100644
--- a/code/modules/overmap/bluespace_rift_vr.dm
+++ b/code/modules/overmap/bluespace_rift_vr.dm
@@ -32,7 +32,7 @@
 
 /obj/effect/overmap/bluespace_rift/attack_ghost(var/mob/observer/dead/user)
 	if(!partner && user?.client?.holder)
-		var/response = tgui_alert(user, "You appear to be staff. This rift has no exit point. If you want to make one, move to where you want it to go, and click 'Make Here', otherwise click 'Cancel'",list("Rift Exit","Cancel","Make Here"))
+		var/response = tgui_alert(user, "You appear to be staff. This rift has no exit point. If you want to make one, move to where you want it to go, and click 'Make Here', otherwise click 'Cancel'", "Bluespace Rift", list("Cancel","Make Here"))
 		if(response == "Make Here")
 			new type(get_turf(user), src)
 	else if(partner)
diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index ea7803991a..4bbad2b3ec 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -580,11 +580,9 @@
 		for(var/obj/item/W in M)
 			if(istype(W, /obj/item/organ/internal/mmi_holder/posibrain))
 				var/obj/item/organ/internal/mmi_holder/MMI = W
-				var/atom/movable/brain = MMI.removed()
-				if(brain)
-					M.remove_from_mob(brain,owner)
-					brain.forceMove(src)
-					items_preserved += brain
+				var/obj/item/device/mmi/brainbox = MMI.removed()
+				if(brainbox)
+					items_preserved += brainbox
 			for(var/slot in slots)
 				var/obj/item/I = M.get_equipped_item(slot = slot)
 				if(I)
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index bc05a72dfc..94df6fa158 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -543,7 +543,7 @@
 		swallow_time = istype(prey, /mob/living/carbon/human) ? belly.human_prey_swallow_time : belly.nonhuman_prey_swallow_time
 
 	//Timer and progress bar
-	if(!do_after(user, swallow_time, prey))
+	if(!do_after(user, swallow_time, prey, exclusive = TRUE))
 		return FALSE // Prey escpaed (or user disabled) before timer expired.
 
 	// If we got this far, nom successful! Announce it!