bugfix: Abductor Surgery Fix (#4303)

ss220-space · Jan 30, 2024 · aef61eb · aef61eb
1 parent 52a0350
commit aef61eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
@@ -38,9 +38,9 @@
 	var/mob/living/carbon/human/AB = target
 	if(IC)
 		user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "<span class='notice'>You pull [IC] out of [target]'s [target_zone].</span>")
-		IC.forceMove_turf()
-		user.put_in_hands(IC, ignore_anim = FALSE)
 		IC.remove(target, ORGAN_MANIPULATION_NOEFFECT)
+		IC.forceMove(get_turf(target))
+		user.put_in_hands(IC, ignore_anim = FALSE)
 		return TRUE
 	if(NO_INTORGANS in AB.dna.species.species_traits)
 		user.visible_message("[user] prepares [target]'s [target_zone] for further dissection!", "<span class='notice'>You prepare [target]'s [target_zone] for further dissection.</span>")

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -1174,7 +1174,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
  * Item will be forceMoved() to turf below its holder.
  */
 /obj/item/proc/forceMove_turf()
-	var/turf/newloc = get(src, /turf)
+	var/turf/newloc = get_turf(src)
 	if(!newloc)
 		CRASH("Item holder is not in turf contents.")
 	forceMove(newloc)