push

code/modules/mob/living/carbon/monkey/combat.dm

@@ -397,7 +397,7 @@
 	return ..()
 
 /mob/living/carbon/monkey/hitby(atom/movable/hitting_atom, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
-	if(istype(hitting_atom, /obj/item))
+	if(isitem(hitting_atom))
 		var/obj/item/item_hitby = hitting_atom
 		var/mob/thrown_by = item_hitby.thrownby?.resolve()
 		if(item_hitby.throwforce < src.health && thrown_by && ishuman(thrown_by))

code/modules/mob/living/living_defense.dm

@@ -107,37 +107,42 @@
 				return FALSE
 
 /mob/living/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
+	var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
 	if(!isitem(AM))
 		// Filled with made up numbers for non-items.
-		if(mob_run_block(AM, 30, "\the [AM.name]", ATTACK_TYPE_THROWN, 0, throwingdatum.thrower, throwingdatum.thrower.zone_selected, list()))
+		if(mob_run_block(AM, 30, "\the [AM.name]", ATTACK_TYPE_THROWN, 0, throwingdatum.thrower, zone, list()) & BLOCK_SUCCESS)
 			hitpush = FALSE
 			skipcatch = TRUE
 			blocked = TRUE
+			return TRUE
 		else
 			playsound(loc, 'sound/weapons/genhit.ogg', 50, TRUE, -1) //Item sounds are handled in the item itself
+		log_combat(AM, src, "hit ")
 		return ..()
 
 	var/obj/item/thrown_item = AM
 	if(thrown_item.thrownby == WEAKREF(src)) //No throwing stuff at yourself to trigger hit reactions
 		return ..()
 
-	if(mob_run_block(AM, thrown_item.throwforce, "\the [thrown_item.name]", ATTACK_TYPE_THROWN, 0, throwingdatum.thrower, throwingdatum.thrower.zone_selected, list()))
+	if(mob_run_block(AM, thrown_item.throwforce, "\the [thrown_item.name]", ATTACK_TYPE_THROWN, 0, throwingdatum.thrower, zone, list()))
 		hitpush = FALSE
 		skipcatch = TRUE
 		blocked = TRUE
 
-	var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
+	// zone moved up because things need it early while checking it from the thrower is unnecessary
 	var/nosell_hit = SEND_SIGNAL(thrown_item, COMSIG_MOVABLE_IMPACT_ZONE, src, zone, throwingdatum, blocked, FALSE)
 	if(nosell_hit)
 		skipcatch = TRUE
 		hitpush = FALSE
 
 	if(blocked)
-		return TRUE
+		return BLOCK_SUCCESS
 
 	var/mob/thrown_by = thrown_item.thrownby?.resolve()
 	if(thrown_by)
 		log_combat(thrown_by, src, "threw and hit", thrown_item)
+	else
+		log_combat(thrown_item, src, "hit ")
 	if(nosell_hit)
 		return ..()
 	visible_message(span_danger("[src] is hit by [thrown_item]!"), \

code/modules/mob/living/simple_animal/bot/honkbot.dm

@@ -139,7 +139,7 @@
 
 
 /mob/living/simple_animal/bot/honkbot/hitby(atom/movable/hitting_atom, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
-	if(istype(hitting_atom, /obj/item))
+	if(isitem(hitting_atom))
 		playsound(src, honksound, 50, TRUE, -1)
 		var/obj/item/item_hitby = hitting_atom
 		var/mob/thrown_by = item_hitby.thrownby?.resolve()

code/modules/mob/living/simple_animal/bot/secbot.dm

@@ -352,7 +352,7 @@
 
 
 /mob/living/simple_animal/bot/secbot/hitby(atom/movable/hitting_atom, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
-	if(istype(hitting_atom, /obj/item))
+	if(isitem(hitting_atom))
 		var/obj/item/item_hitby = hitting_atom
 		var/mob/thrown_by = item_hitby.thrownby?.resolve()
 		if(item_hitby.throwforce < src.health && thrown_by && ishuman(thrown_by))

code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm

@@ -44,13 +44,13 @@
 		visible_message("<span class='danger'>[P] has a reduced effect on [src]!</span>")
 	return ..()
 
-/mob/living/simple_animal/hostile/asteroid/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)//No floor tiling them to death, wiseguy
-	if(istype(AM, /obj/item))
-		var/obj/item/T = AM
+/mob/living/simple_animal/hostile/asteroid/hitby(atom/movable/hitting_atom, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)//No floor tiling them to death, wiseguy
+	if(isitem(hitting_atom))
+		var/obj/item/item_hitby = hitting_atom
 		if(!stat)
 			Aggro()
-		if(T.throwforce <= 20)
-			visible_message(span_notice("The [T.name] [throw_message] [src.name]!"))
+		if(item_hitby.throwforce <= 20)
+			visible_message(span_notice("\The [item_hitby] [throw_message] [src]!"))
 			return
 	..()
 

code/modules/mob/living/simple_animal/hostile/mushroom.dm

@@ -180,11 +180,11 @@
 	if(M.a_intent == INTENT_HARM)
 		Bruise()
 
-/mob/living/simple_animal/hostile/mushroom/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
+/mob/living/simple_animal/hostile/mushroom/hitby(atom/movable/hitting_atom, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
 	..()
-	if(istype(AM, /obj/item))
-		var/obj/item/T = AM
-		if(T.throwforce)
+	if(isitem(hitting_atom))
+		var/obj/item/item_hitby = hitting_atom
+		if(item_hitby.throwforce)
 			Bruise()
 
 /mob/living/simple_animal/hostile/mushroom/bullet_act(obj/item/projectile/P)