Refactors bottle smashing, apply_hit_effect() now returns the blocked status.

Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm

code/game/objects/items/robot/robot_items.dm

@@ -19,11 +19,11 @@
 		qdel(src)
 		return
 
+	user.visible_message("<span class='danger'>\The [user] has prodded \the [M] with \a [src]!</span>")
+
 	if(!user.cell || !user.cell.checked_use(1250)) //Slightly more than a baton.
-		user.visible_message("<span class='danger'>\The [user] has prodded \the [M] with its arm!</span>")
 		return
 
-	user.visible_message("<span class='danger'>\The [user] has prodded \the [M] with \a [src]!</span>")
 	playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
 	
 	M.apply_effect(5, STUTTER)

code/game/objects/items/weapons/stunbaton.dm

@@ -112,8 +112,7 @@
 
 /obj/item/weapon/melee/baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
 	if(isrobot(target))
-		..()
-		return
+		return ..()
 
 	var/agony = agonyforce
 	var/stun = stunforce
@@ -123,7 +122,7 @@
 		affecting = H.get_organ(hit_zone)
 
 	if(user.a_intent == I_HURT)
-		..()
+		. = ..()
 		//whacking someone causes a much poorer electrical contact than deliberately prodding them.
 		agony *= 0.5
 		stun *= 0.5