Merge remote-tracking branch 'citadel/master' into clickcd_experimental

code/game/machinery/iv_drip.dm

@@ -159,8 +159,6 @@
 			update_icon()
 
 /obj/machinery/iv_drip/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
-	if(!ishuman(user))
-		return
 	if(attached)
 		visible_message("[attached] is detached from [src]")
 		attached = null
@@ -171,7 +169,11 @@
 	else
 		toggle_mode()
 
-/obj/machinery/iv_drip/verb/eject_beaker()
+/obj/machinery/iv_drip/attack_robot(mob/user)
+	if(Adjacent(user))
+		attack_hand(user)
+
+/obj/machinery/iv_drip/verb/eject_beaker(mob/user)
 	set category = "Object"
 	set name = "Remove IV Container"
 	set src in view(1)
@@ -186,6 +188,8 @@
 		if(usr && Adjacent(usr) && usr.can_hold_items())
 			if(!usr.put_in_hands(beaker))
 				beaker.forceMove(drop_location())
+		if(iscyborg(user))
+			beaker.forceMove(drop_location())
 		beaker = null
 		update_icon()