From 97817469d22f914f2e61630371fec070a8aa8172 Mon Sep 17 00:00:00 2001
From: skull132 <skull132@users.noreply.github.com>
Date: Tue, 18 Jul 2017 12:22:52 +0300
Subject: [PATCH] Fixes #2978 and #3084 (#3086)

Fixes #2978
Fixes #3084
---
 code/game/objects/items/weapons/autopsy.dm | 19 +++----------------
 code/modules/mob/mob.dm                    | 17 ++++++++---------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm
index d9bd30e7887..1a0d421f215 100644
--- a/code/game/objects/items/weapons/autopsy.dm
+++ b/code/game/objects/items/weapons/autopsy.dm
@@ -79,7 +79,8 @@
 	set category = "Object"
 	set src in view(usr, 1)
 	set name = "Print Data"
-	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
+
+	if(use_check(usr))
 		usr << "No."
 		return
 
@@ -159,21 +160,7 @@
 	P.info = "<tt>[scan_data]</tt>"
 	P.icon_state = "paper_words"
 
-	if(istype(usr,/mob/living/carbon))
-		// place the item in the usr's hand if possible
-		if(!usr.r_hand)
-			P.loc = usr
-			usr.r_hand = P
-			P.layer = 20
-		else if(!usr.l_hand)
-			P.loc = usr
-			usr.l_hand = P
-			P.layer = 20
-
-	if (ismob(src.loc))
-		var/mob/M = src.loc
-		M.update_inv_l_hand()
-		M.update_inv_r_hand()
+	usr.put_in_hands(P)
 
 /obj/item/weapon/autopsy_scanner/attack(mob/living/carbon/human/M as mob, mob/living/carbon/user as mob)
 	if(!istype(M))
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 304fa604d78..d261953f0b8 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -29,8 +29,8 @@
 	if (istype(src, /mob/living))
 		ghostize()
 
-	return ..() 
-	
+	return ..()
+
 
 /mob/proc/remove_screen_obj_references()
 	flash = null
@@ -211,7 +211,7 @@
 
 /mob/proc/is_physically_disabled()
 	return incapacitated(INCAPACITATION_DISABLED)
-	
+
 /mob/proc/cannot_stand()
 	return incapacitated(INCAPACITATION_KNOCKDOWN)
 
@@ -746,7 +746,7 @@
 							LAZYREMOVE(client.holder.watched_processes, ctrl)
 						else
 							ctrl.stat_entry()
-						
+
 			if(statpanel("MC"))
 				stat("CPU:", world.cpu)
 				stat("Tick Usage:", world.tick_usage)
@@ -766,7 +766,7 @@
 					for(var/datum/controller/subsystem/SS in Master.subsystems)
 						if (!Master.initializing && SS.flags & SS_NO_DISPLAY)
 							continue
-					
+
 						SS.stat_entry()
 
 		if(listed_turf && client)
@@ -1137,12 +1137,11 @@ mob/proc/yank_out_object()
 	return
 
 /mob/verb/face_direction()
-
 	set name = "Face Direction"
 	set category = "IC"
 	set src = usr
 
-	set_face_dir()
+	set_face_dir(dir)
 
 	if(!facing_dir)
 		usr << "You are now not facing anything."
@@ -1175,11 +1174,11 @@ mob/proc/yank_out_object()
 	if (dest != loc && istype(dest, /atom/movable))
 		AM = dest
 		LAZYADD(AM.contained_mobs, src)
-	
+
 	if (istype(loc, /atom/movable))
 		AM = loc
 		LAZYREMOVE(AM.contained_mobs, src)
-	
+
 	. = ..()
 
 /mob/verb/northfaceperm()