mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
fix: Storage shuffling sound now works for mousedrops (#21662)
https://github.com/ss220-space/Paradise/pull/1357
This commit is contained in:
@@ -111,7 +111,7 @@
|
||||
if(over_object == M && Adjacent(M)) // this must come before the screen objects only block
|
||||
if(M.s_active)
|
||||
M.s_active.close(M)
|
||||
show_to(M)
|
||||
open(M)
|
||||
return
|
||||
|
||||
if((istype(over_object, /obj/structure/table) || isfloorturf(over_object)) && length(contents) \
|
||||
@@ -155,13 +155,12 @@
|
||||
if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
|
||||
if(usr.s_active)
|
||||
usr.s_active.close(usr)
|
||||
show_to(usr)
|
||||
open(usr)
|
||||
|
||||
/obj/item/storage/AltClick(mob/user)
|
||||
. = ..()
|
||||
if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE))
|
||||
show_to(user)
|
||||
playsound(loc, use_sound, 50, TRUE, -5)
|
||||
open(user)
|
||||
add_fingerprint(user)
|
||||
else if(isobserver(user))
|
||||
show_to(user)
|
||||
@@ -239,7 +238,7 @@
|
||||
hide_from(M)
|
||||
|
||||
/obj/item/storage/proc/open(mob/user)
|
||||
if(use_sound)
|
||||
if(use_sound && isliving(user))
|
||||
playsound(loc, use_sound, 50, TRUE, -5)
|
||||
|
||||
if(user.s_active)
|
||||
@@ -547,8 +546,6 @@
|
||||
|
||||
|
||||
/obj/item/storage/attack_hand(mob/user)
|
||||
playsound(loc, use_sound, 50, TRUE, -5)
|
||||
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(!H.get_active_hand())
|
||||
@@ -565,7 +562,7 @@
|
||||
if(loc == user)
|
||||
if(user.s_active)
|
||||
user.s_active.close(user)
|
||||
show_to(user)
|
||||
open(user)
|
||||
else
|
||||
..()
|
||||
add_fingerprint(user)
|
||||
|
||||
Reference in New Issue
Block a user