Part 5

code/game/gamemodes/miniantags/abduction/abduction.dm

@@ -111,7 +111,7 @@
 		agent = agents[team_number]
 		H = agent.current
 		L = agent_landmarks[team_number]
-		H.loc = L.loc
+		H.forceMove(get_turf(L))
 		H.set_species("Abductor")
 		H.mind.abductor.agent = 1
 		H.mind.abductor.team = team_number
@@ -123,7 +123,7 @@
 		scientist = scientists[team_number]
 		H = scientist.current
 		L = scientist_landmarks[team_number]
-		H.loc = L.loc
+		H.forceMove(get_turf(L))
 		H.set_species("Abductor")
 		H.mind.abductor.scientist = 1
 		H.mind.abductor.team = team_number
@@ -155,7 +155,7 @@
 	agent = agents[team_number]
 	H = agent.current
 	L = agent_landmarks[team_number]
-	H.loc = L.loc
+	H.forceMove(get_turf(L))
 	H.set_species("Abductor")
 	H.mind.abductor.agent = 1
 	H.mind.abductor.team = team_number
@@ -168,7 +168,7 @@
 	scientist = scientists[team_number]
 	H = scientist.current
 	L = scientist_landmarks[team_number]
-	H.loc = L.loc
+	H.forceMove(get_turf(L))
 	H.set_species("Abductor")
 	H.mind.abductor.scientist = 1
 	H.mind.abductor.team = team_number
@@ -243,6 +243,7 @@
 	agent.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/decloner/alien(agent), slot_belt)
 	agent.equip_to_slot_or_del(new /obj/item/device/abductor/silencer(agent), slot_in_backpack)
 	agent.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/abductor(agent), slot_head)
+	agent.update_icons()
 
 
 /datum/game_mode/abduction/proc/equip_scientist(var/mob/living/carbon/human/scientist,var/team_number)
@@ -258,6 +259,7 @@
 
 	var/obj/item/weapon/implant/abductor/beamplant = new /obj/item/weapon/implant/abductor(scientist)
 	beamplant.implant(scientist)
+	scientist.update_icons()
 
 
 /datum/game_mode/abduction/check_finished()

code/game/gamemodes/miniantags/abduction/abduction_gear.dm

@@ -49,7 +49,7 @@
 	if(disguise == null)
 		return
 	stealth_active = 1
-	if(istype(src.loc, /mob/living/carbon/human))
+	if(ishuman(loc))
 		var/mob/living/carbon/human/M = src.loc
 		spawn(0)
 			anim(M.loc,M,'icons/mob/mob.dmi',,"cloak",,M.dir)
@@ -66,7 +66,7 @@
 	if(!stealth_active)
 		return
 	stealth_active = 0
-	if(istype(src.loc, /mob/living/carbon/human))
+	if(ishuman(loc))
 		var/mob/living/carbon/human/M = src.loc
 		spawn(0)
 			anim(M.loc,M,'icons/mob/mob.dmi',,"uncloak",,M.dir)
@@ -94,7 +94,7 @@
 				ActivateStealth()
 
 /obj/item/clothing/suit/armor/abductor/vest/proc/Adrenaline()
-	if(istype(src.loc, /mob/living/carbon/human))
+	if(ishuman(loc))
 		if(combat_cooldown != initial(combat_cooldown))
 			to_chat(src.loc, "<span class='warning'>Combat injection is still recharging.</span>")
 			return
@@ -232,7 +232,7 @@
 	radio_off(target, user)
 
 /obj/item/device/abductor/silencer/proc/radio_off(atom/target, mob/living/user)
-	if( !(user in (viewers(7,target))) )
+	if(!(user in (viewers(7,target))))
 		return
 
 	var/turf/targloc = get_turf(target)

code/game/gamemodes/miniantags/abduction/abduction_surgery.dm

@@ -6,10 +6,7 @@
 /datum/surgery/organ_extraction/can_start(mob/user, mob/living/carbon/target)
 	if(!ishuman(user))
 		return 0
-	if(target.get_species() == "Machine")
-		return 0
-	var/mob/living/carbon/human/AB = target
-	if(AB.species.flags & NO_INTORGANS)
+	if(target.get_species() == "Machine") //Maybe add in a machine version, later?
 		return 0
 	var/mob/living/carbon/human/H = user
 	if(H.get_species() == "Abductor")
@@ -35,6 +32,10 @@
 	..()
 
 /datum/surgery_step/internal/extract_organ/end_step(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+	var/mob/living/carbon/human/AB = target
+	if(AB.species.flags & NO_INTORGANS)
+		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>")
+		return 1
 	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>")
 		user.put_in_hands(IC)

code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm

@@ -62,7 +62,7 @@
 	if(istype(W, /obj/item/organ/internal/gland))
 		if(!user.drop_item())
 			return
-		W.loc = src
+		W.forceMove(src)
 		for(var/i=1,i<=gland_colors.len,i++)
 			if(gland_types[i] == W.type)
 				amounts[i]++