mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-11 10:11:09 +00:00
can sounds reorganization and new bottle cap sounds (#87456)
This commit is contained in:
@@ -321,9 +321,9 @@
|
||||
)
|
||||
if(SFX_CAN_OPEN)
|
||||
soundin = pick(
|
||||
'sound/effects/can/can_open1.ogg',
|
||||
'sound/effects/can/can_open2.ogg',
|
||||
'sound/effects/can/can_open3.ogg',
|
||||
'sound/items/can/can_open1.ogg',
|
||||
'sound/items/can/can_open2.ogg',
|
||||
'sound/items/can/can_open3.ogg',
|
||||
)
|
||||
if(SFX_BULLET_MISS)
|
||||
soundin = pick(
|
||||
|
||||
@@ -264,11 +264,12 @@
|
||||
cap_lost = TRUE
|
||||
else
|
||||
to_chat(user, span_notice("You remove the cap from [src]."))
|
||||
playsound(loc, 'sound/effects/can/can_open1.ogg', 50, TRUE)
|
||||
playsound(loc, 'sound/items/handling/reagent_containers/plastic_bottle/bottle_cap_open.ogg', 50, TRUE)
|
||||
else
|
||||
cap_on = TRUE
|
||||
spillable = FALSE
|
||||
to_chat(user, span_notice("You put the cap on [src]."))
|
||||
playsound(loc, 'sound/items/handling/reagent_containers/plastic_bottle/bottle_cap_close.ogg', 50, TRUE)
|
||||
update_appearance()
|
||||
return CLICK_ACTION_SUCCESS
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
if(iter_mob != target)
|
||||
iter_mob.add_mood_event("observed_soda_spill", /datum/mood_event/observed_soda_spill, target, src)
|
||||
|
||||
playsound(src, 'sound/effects/can/can_pop.ogg', 80, TRUE)
|
||||
playsound(src, 'sound/items/can/can_pop.ogg', 80, TRUE)
|
||||
if(!hide_message)
|
||||
visible_message(span_danger("[src] spills over, fizzing its contents all over [target]!"))
|
||||
spillable = TRUE
|
||||
@@ -151,7 +151,7 @@
|
||||
|
||||
/obj/item/reagent_containers/cup/soda_cans/attack_self_secondary(mob/user)
|
||||
if(!is_drainable())
|
||||
playsound(src, 'sound/effects/can/can_shake.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/can/can_shake.ogg', 50, TRUE)
|
||||
user.visible_message(span_danger("[user] shakes [src]!"), span_danger("You shake up [src]!"), vision_distance=2)
|
||||
fizziness += SODA_FIZZINESS_SHAKE
|
||||
return
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
plastic_bottle_liquid_slosh:
|
||||
liquid in bottle shaking by mrrap4food -- https://freesound.org/s/470606/ -- License: Creative Commons 0
|
||||
|
||||
bottle cap:
|
||||
made by sadboysuss: license: cc-by-sa
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user