forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feat: More interaction sounds (#307)
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> ## Что этот PR делает Добавляет больше звуков взаимодействия с предметами. Далеко не все и не для всего, но это больше чем было. _Нужно ещё как-то придумать лист для /obj/item, я не додумался - надеюсь кто-то сделает за меня._ - Добавляет звук lock/unlock для шкафчика - Добавляет больше звуков pickup/drop для предметов ## Почему это хорошо для игры Иммерсив геймплей ## Изображения изменений https://github.com/ss220club/Paradise-SS220/assets/20109643/c6eaa301-07e8-4821-b7d3-6f0cdf5ca56c https://github.com/ss220club/Paradise-SS220/assets/20109643/c75cbde5-c180-4931-97d7-969ce6685098 ## Тестирование В игре ## Changelog :cl: add: Больше звуков взаимодействия с предметами add: Добавлен звук lock/unlock для шкафчика /:cl: <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. -->
- Loading branch information
Showing
39 changed files
with
222 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,4 @@ | ||
#include "_aesthetics_sounds.dm" | ||
|
||
#include "code/closet.dm" | ||
#include "code/items.dm" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
/obj/structure/closet/secure_closet/togglelock(mob/user) | ||
. = ..() | ||
var/list/togglelock_sound = list( | ||
'modular_ss220/aesthetics_sounds/sound/lock_1.ogg', | ||
'modular_ss220/aesthetics_sounds/sound/lock_2.ogg', | ||
'modular_ss220/aesthetics_sounds/sound/lock_3.ogg' | ||
) | ||
if(allowed(user)) | ||
locked = !locked | ||
playsound(loc, pick(togglelock_sound), 10, TRUE, -3) | ||
return ..() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,208 @@ | ||
//TODO: /obj/item generic drop & pickup sound from list (cannot figure out how to put it better in list) | ||
|
||
/* MISCELLANEOUS */ | ||
/obj/item/card | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/card.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/card.ogg' | ||
|
||
/obj/item/coin | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/ring.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/ring.ogg' | ||
|
||
/obj/item/bedsheet | ||
drop_sound = 'sound/items/handling/cloth_drop.ogg' | ||
pickup_sound = 'sound/items/handling/cloth_pickup.ogg' | ||
|
||
/obj/item/stock_parts | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/beach_ball | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/basketball.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/basketball.ogg' | ||
|
||
/obj/item/ammo_box | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/ammobox.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/ammobox.ogg' | ||
|
||
/* KNIFE */ | ||
/obj/item/nullrod/tribal_knife | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/knife.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/knife.ogg' | ||
|
||
/obj/item/kitchen/knife | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/knife.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/knife.ogg' | ||
|
||
/obj/item/kitchen/knife/plastic | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/obj/item/kitchen/knife/carrotshiv | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/* CLOTHING */ | ||
/obj/item/clothing | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/clothing.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/clothing.ogg' | ||
|
||
/obj/item/clothing/head/helmet | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/helmet.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/helmet.ogg' | ||
|
||
/obj/item/clothing/shoes | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/shoes.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/shoes.ogg' | ||
|
||
/obj/item/clothing/shoes/combat | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/boots.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/boots.ogg' | ||
|
||
/obj/item/clothing/shoes/jackboots | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/boots.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/boots.ogg' | ||
|
||
/obj/item/clothing/shoes/workboots | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/boots.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/boots.ogg' | ||
|
||
/obj/item/clothing/shoes/cowboy | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/boots.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/boots.ogg' | ||
|
||
/obj/item/clothing/shoes/magboots | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/boots.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/boots.ogg' | ||
|
||
/obj/item/clothing/shoes/magboots/clown | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/shoes.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/shoes.ogg' | ||
|
||
/obj/item/clothing/gloves/ring | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/ring.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/ring.ogg' | ||
|
||
/obj/item/clothing/accessory/holobadge | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/accessory.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/accessory.ogg' | ||
|
||
/obj/item/clothing/accessory/lawyers_badge | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/accessory.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/accessory.ogg' | ||
|
||
/obj/item/clothing/accessory/medal | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/accessory.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/accessory.ogg' | ||
|
||
/obj/item/clothing/accessory/necklace | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/accessory.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/accessory.ogg' | ||
|
||
/obj/item/clothing/accessory/holster | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/backpack.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/backpack.ogg' | ||
|
||
/obj/item/clothing/accessory/storage | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/backpack.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/backpack.ogg' | ||
|
||
/* GUNS */ | ||
/obj/item/gun | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/gun.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/gun.ogg' | ||
|
||
/obj/item/gun/magic | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/obj/item/gun/projectile/shotgun/toy | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/obj/item/gun/projectile/automatic/toy | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/obj/item/gun/projectile/automatic/c20r/toy | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/obj/item/gun/projectile/automatic/l6_saw/toy | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/obj/item/gun/projectile/automatic/sniper_rifle/toy | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/* FIREAXE */ | ||
/obj/item/fireaxe | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/axe.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/axe.ogg' | ||
|
||
/obj/item/fireaxe/boneaxe | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/obj/item/pickaxe | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/axe.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/axe.ogg' | ||
|
||
/obj/item/pickaxe/bone | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg' | ||
|
||
/* BACKPACKS */ | ||
/obj/item/storage/backpack | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/backpack.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/backpack.ogg' | ||
|
||
/obj/item/storage/bag | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/backpack.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/backpack.ogg' | ||
|
||
/obj/item/storage/belt | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/backpack.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/backpack.ogg' | ||
|
||
/* ORGANS */ | ||
/obj/item/organ | ||
drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/flesh.ogg' | ||
pickup_sound = 'modular_ss220/aesthetics_sounds/sound/handling/pickup/flesh.ogg' | ||
|
||
/obj/item/organ/internal/cell | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/organ/internal/cyberimp | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/organ/internal/ears/cybernetic | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/organ/internal/ears/microphone | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/organ/internal/eyes/cybernetic | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/organ/internal/heart/cybernetic | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/organ/internal/kidneys/cybernetic | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/organ/internal/liver/cybernetic | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' | ||
|
||
/obj/item/organ/internal/lungs/cybernetic | ||
drop_sound = 'sound/items/handling/component_drop.ogg' | ||
pickup_sound = 'sound/items/handling/component_pickup.ogg' |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.