From dd67c2b195c54518a9daa1fb4bcd03278c637cb9 Mon Sep 17 00:00:00 2001
From: Seris02 <littlenebulae421@gmail.com>
Date: Sun, 19 Feb 2023 17:19:43 +0800
Subject: [PATCH] makes the holder object disappear right away, and fixes
 people horizontal walking after being picked up

---
 code/modules/mob/holder.dm              | 14 +++++++++-----
 code/modules/vore/resizing/holder_vr.dm |  5 +++++
 vorestation.dme                         |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 code/modules/vore/resizing/holder_vr.dm

diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 5e4ff61e0e..33f4694b7f 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -50,6 +50,7 @@ var/list/holder_mob_icon_cache = list()
 /obj/item/weapon/holder/Exited(atom/movable/thing, atom/OldLoc)
 	if(thing == held_mob)
 		held_mob.transform = original_transform
+		held_mob.update_transform() //VOREStation edit
 		held_mob.vis_flags = original_vis_flags
 		held_mob = null
 	..()
@@ -70,11 +71,14 @@ var/list/holder_mob_icon_cache = list()
 /obj/item/weapon/holder/proc/dump_mob()
 	if(!held_mob)
 		return
-	held_mob.transform = original_transform
-	held_mob.vis_flags = original_vis_flags
-	held_mob.forceMove(get_turf(src))
-	held_mob.reset_view(null)
-	held_mob = null
+	if (held_mob.loc == src || isnull(held_mob.loc)) //VOREStation edit
+		held_mob.transform = original_transform
+		held_mob.update_transform() //VOREStation edit
+		held_mob.vis_flags = original_vis_flags
+		held_mob.forceMove(get_turf(src))
+		held_mob.reset_view(null)
+		held_mob = null
+	invisibility = INVISIBILITY_ABSTRACT //VOREStation edit
 
 /obj/item/weapon/holder/throw_at(atom/target, range, speed, thrower)
 	if(held_mob)
diff --git a/code/modules/vore/resizing/holder_vr.dm b/code/modules/vore/resizing/holder_vr.dm
new file mode 100644
index 0000000000..2b23228dd1
--- /dev/null
+++ b/code/modules/vore/resizing/holder_vr.dm
@@ -0,0 +1,5 @@
+/obj/item/weapon/holder/dropped(mob/user)
+	if (held_mob?.loc != src || isturf(loc))
+		var/held = held_mob
+		dump_mob()
+		held_mob = held
diff --git a/vorestation.dme b/vorestation.dme
index f56bf5ddcd..6e119b3f84 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4057,6 +4057,7 @@
 #include "code\modules\vore\persist\persist_vr.dm"
 #include "code\modules\vore\resizing\grav_pull_vr.dm"
 #include "code\modules\vore\resizing\holder_micro_vr.dm"
+#include "code\modules\vore\resizing\holder_vr.dm"
 #include "code\modules\vore\resizing\resize_vr.dm"
 #include "code\modules\vore\resizing\sizegun_slow_vr.dm"
 #include "code\modules\vore\resizing\sizegun_vr.dm"