Merge remote-tracking branch 'upstream/master' into mechastuff

# Conflicts:
#	code/game/mecha/mecha.dm

code/modules/mob/living/carbon/give.dm

@@ -29,7 +29,7 @@
 			if("Yes")
 				if(!I)
 					return
-				if(!Adjacent(usr))
+				if(!Adjacent(target))
 					to_chat(usr, "<span class='warning'> You need to stay in reaching distance while giving an object.</span>")
 					to_chat(target, "<span class='warning'> [usr.name] moved too far away.</span>")
 					return

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -132,7 +132,7 @@
 				to_chat(user, "<span class='warning'>The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.</span>")
 				return
 
-			if(!allowed(usr))
+			if(!allowed(W))
 				to_chat(user, "<span class='warning'>Access denied.</span>")
 				return
 
@@ -158,7 +158,7 @@
 			if(emagged)
 				return
 
-			if(allowed(usr))
+			if(allowed(W))
 				shut_down()
 			else
 				to_chat(user, "<span class='warning'>Access denied.</span>")
@@ -223,6 +223,10 @@
 	health = 35 - (getBruteLoss() + getFireLoss())
 	update_stat("updatehealth([reason])")
 
+/mob/living/silicon/robot/drone/death(gibbed)
+	. = ..(gibbed)
+	ghostize(can_reenter_corpse = 0)
+
 
 //CONSOLE PROCS
 /mob/living/silicon/robot/drone/proc/law_resync()