diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 4b11c522bf9..9ea9638fa9e 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -359,17 +359,8 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 	if(usr.stat || usr.restrained() || !Adjacent(usr) || usr.stunned || usr.weakened || usr.lying)
 		return
 
-	if(ishuman(usr) || ismonkey(usr) || isdrone(usr))
-		if(usr.get_active_hand() == null)
-			usr.UnarmedAttack(src) // Let me know if this has any problems -Giacom | Actually let me know now.  -Sayu
-		/*
-		if(usr.get_active_hand() == null)
-			src.attack_hand(usr)
-		else
-			usr << "\red You already have something in your hand."
-		*/
-	else
-		usr << "<span class='warning'>This mob type can't use this verb!</span>"
+	if(usr.get_active_hand() == null) // Let me know if this has any problems -Yota
+		usr.UnarmedAttack(src)
 
 //This proc is executed when someone clicks the on-screen UI button. To make the UI button show, set the 'action_button_name'.
 //The default action is attack_self().
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 1f9159c480e..c3e11813e09 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -25,8 +25,8 @@
 /obj/item/weapon/watertank/verb/toggle_mister()
 	set name = "Toggle Mister"
 	set category = "Object"
-	if (usr.get_item_by_slot(slot_back) != src && usr.get_item_by_slot(slot_drone_storage) != src)
-		usr << "<span class='warning'>The watertank needs to be on your back to use!</span>"
+	if (usr.get_item_by_slot(usr.getWatertankSlot()) != src)
+		usr << "<span class='warning'>The watertank must be worn properly to use!</span>"
 		return
 	if(usr.incapacitated())
 		return
@@ -75,8 +75,8 @@
 	..()
 
 /obj/item/weapon/watertank/MouseDrop(obj/over_object)
-	if(ishuman(src.loc) || isdrone(src.loc))
-		var/mob/living/carbon/human/H = src.loc
+	var/mob/H = src.loc
+	if(istype(H))
 		switch(over_object.name)
 			if("r_hand")
 				if(H.r_hand)
@@ -98,6 +98,10 @@
 		return
 	..()
 
+/mob/proc/getWatertankSlot() return slot_back
+
+/mob/living/simple_animal/drone/getWatertankSlot() return slot_drone_storage
+
 // This mister item is intended as an extension of the watertank and always attached to it.
 // Therefore, it's designed to be "locked" to the player's hands or extended back onto
 // the watertank backpack. Allowing it to be placed elsewhere or created without a parent
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index 11f9609b0fa..8c057a49d3c 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -135,6 +135,6 @@
 	else if (istype(T) && T.can_be_inserted(I,1)) // If carrying storage item like toolbox
 		T.handle_item_insertion(I)
 	else if(!internal_storage)
-		equip_to_slot(I, "drone_storage_slot")
+		equip_to_slot(I, slot_drone_storage)
 	else
 		usr << "<span class='warning'>You are unable to equip that!</span>"