cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

New generic pickup and drop sounds (#9701)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-08-21 22:33:00 -03:00
committed by GitHub
parent 02b6b9a29d
commit baca20621f
11 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+4 -2
View File
@@ -53,9 +53,9 @@
///Sound used when equipping the item into a valid slot
var/equip_sound = null
///Sound uses when picking the item up (into your hands)
var/pickup_sound = 'sound/items/pickup/device.ogg'
var/pickup_sound = "generic_pickup"
///Sound uses when dropping the item, or when its thrown.
var/drop_sound = 'sound/items/drop/device.ogg' // drop sound - this is the default
var/drop_sound = "generic_drop" // drop sound - this is the default
//Item_state definition moved to /obj
//var/item_state = null // Used to specify the item state for the on-mob overlays.
@@ -111,6 +111,8 @@
slot_l_hand_str = 'icons/mob/items/lefthand_device.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_device.dmi',
)
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/atom/proc/get_cell()
return DEVICE_NO_CELL
code/game/sound.dm
+16 -5
View File
@@ -271,10 +271,19 @@ var/list/drillhit_sound = list(
'sound/weapons/saw/drillhit2.ogg'
)
// drop/equip/pickup sounds if there are multiple.
var/list/wield_generic_sound = list(
'sound/items/wield/wield_generic1.ogg',
'sound/items/wield/wield_generic2.ogg',
'sound/items/wield/wield_generic3.ogg'
var/list/generic_drop_sound = list(
'sound/items/drop/generic1.ogg',
'sound/items/drop/generic2.ogg',
)
var/list/generic_pickup_sound = list(
'sound/items/pickup/generic1.ogg',
'sound/items/pickup/generic2.ogg',
'sound/items/pickup/generic3.ogg',
)
var/list/generic_wield_sound = list(
'sound/items/wield/generic1.ogg',
'sound/items/wield/generic2.ogg',
'sound/items/wield/generic3.ogg'
)
var/list/sword_pickup_sound = list(
'sound/items/pickup/sword1.ogg',
@@ -519,7 +528,9 @@ var/list/gauss_fire_sound = list(
if ("crowbar") soundin = pick(crowbar_sound)
if ("casing_drop") soundin = pick(casing_drop_sound)
if ("drillhit") soundin = pick(drillhit_sound)
if ("wield_generic") soundin = pick(wield_generic_sound)
if ("generic_drop") soundin = pick(generic_drop_sound)
if ("generic_pickup") soundin = pick(generic_pickup_sound)
if ("generic_wield") soundin = pick(generic_wield_sound)
if ("equip_sword") soundin = pick(sword_equip_sound)
if ("pickup_sword") soundin = pick(sword_pickup_sound)
if ("gauss_fire") soundin = pick(gauss_fire_sound)