Merge pull request #1948 from caelaislinn/master

Bug fixes

code/game/machinery/bots/medbot.dm

@@ -512,13 +512,16 @@
 	else if(istype(src,/obj/item/weapon/storage/firstaid/adv))
 		A.skin = "adv"
 
-	A.loc = user
-	if (user.r_hand == S)
-		user.u_equip(S)
-		user.r_hand = A
+	//A.loc = user
+	if(src.loc == user)
+		if (user.r_hand == S)
+			user.u_equip(S)
+			user.equip_to_slot_if_possible(A, slot_r_hand)
+		else
+			user.u_equip(S)
+			user.equip_to_slot_if_possible(A, slot_l_hand)
 	else
-		user.u_equip(S)
-		user.l_hand = A
+		A.loc = src.loc
 	A.layer = 20
 	user << "You add the robot arm to the first aid kit"
 	del(S)

code/modules/reagents/reagent_containers/hypospray.dm

@@ -55,7 +55,7 @@
 /obj/item/weapon/reagent_containers/hypospray/autoinjector
 	name = "autoinjector"
 	desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel."
-	icon_state = "autoinjector1"
+	icon_state = "autoinjector"
 	item_state = "autoinjector"
 	amount_per_transfer_from_this = 5
 	volume = 5