Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: More interaction sounds #307

Merged
merged 4 commits into from
Oct 5, 2023
Merged

Feat: More interaction sounds #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfac57b
Feat: More interaction sounds
dj-34 Oct 5, 2023
7f26215
not used (for now)
dj-34 Oct 5, 2023
a87beb7
coin sound
dj-34 Oct 5, 2023
f2e540f
bedsheet sound
dj-34 Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modular_ss220/aesthetics_sounds/_aesthetics_sounds.dme
View file
Open in desktop
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"
11 changes: 11 additions & 0 deletions modular_ss220/aesthetics_sounds/code/closet.dm
View file
Open in desktop
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 ..()
208 changes: 208 additions & 0 deletions modular_ss220/aesthetics_sounds/code/items.dm
View file
Open in desktop
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 added modular_ss220/aesthetics_sounds/sound/handling/drop/accessory.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/ammobox.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/axe.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/backpack.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/basketball.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/boots.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/card.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/clothing.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/flesh.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/generic1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/generic2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/gun.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/helmet.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/knife.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/ring.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/drop/shoes.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/accessory.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/ammobox.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/axe.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/backpack.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/basketball.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/boots.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/card.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/clothing.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/flesh.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/generic1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/generic2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/generic3.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/gun.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/helmet.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/knife.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/ring.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/handling/pickup/shoes.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/lock_1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/lock_2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/aesthetics_sounds/sound/lock_3.ogg
View file
Open in desktop
Binary file not shown.