diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm index 48f42ba16b..5c534bf45b 100644 --- a/code/datums/organs/organ_external.dm +++ b/code/datums/organs/organ_external.dm @@ -105,8 +105,9 @@ possible_points += children if(forbidden_limbs.len) possible_points -= forbidden_limbs - // if(!possible_points.len) - // message_admins("Oh god WHAT! [owner]'s [src] was unable to find an organ to pass overdamage to!") + if(!possible_points.len) + if(owner.stat != 2) + message_admins("Oh god WHAT! [owner]'s [src] was unable to find an organ to pass overdamage to!") else var/datum/organ/external/target = pick(possible_points) if(brute) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 12b1fe06ac..cffc5986f3 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -88,7 +88,7 @@ datum var/current_reagent_transfer = current_reagent.volume * part if(preserve_data) trans_data = current_reagent.data - if(current_reagent.id != "blood") + if((current_reagent.id == "blood" && !ishuman(target)) || current_reagent.id != "blood") R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data) src.remove_reagent(current_reagent.id, current_reagent_transfer) else if(current_reagent.id == "blood" && ishuman(target)) // can never be sure