mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Throwables Fix (#10066)
Catching fragile containers no longer causes them to shatter.
Catching items no longer plays the hit by thrown item sound.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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."
|
||||
Reference in New Issue
Block a user