diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 238ca7b5fa9..386c62a3e0d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -287,6 +287,10 @@ /obj/item/throw_impact(atom/hit_atom) ..() if(isliving(hit_atom)) //Living mobs handle hit sounds differently. + var/mob/living/L = hit_atom + if(L.in_throw_mode) + playsound(hit_atom, pickup_sound, PICKUP_SOUND_VOLUME, TRUE) + return var/volume = get_volume_by_throwforce_and_or_w_class() if(throwforce > 0) if(mob_throw_hit_sound) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 17dc4e326cd..de75456de51 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -60,7 +60,7 @@ /obj/item/reagent_containers/throw_impact(atom/hit_atom, var/speed) . = ..() - if((speed >= fragile) && shatter) + if((speed >= fragile) && shatter && !ismob(loc)) shatter() /obj/item/reagent_containers/proc/shatter(var/obj/item/W, var/mob/user) diff --git a/html/changelogs/geeves-throwables_fix.yml b/html/changelogs/geeves-throwables_fix.yml new file mode 100644 index 00000000000..d7ab4ba9858 --- /dev/null +++ b/html/changelogs/geeves-throwables_fix.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Catching fragile containers no longer causes them to shatter." + - bugfix: "Catching items no longer plays the hit by thrown item sound." \ No newline at end of file