diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index fa86e96de0..e437ac5c8b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -555,11 +555,11 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb item_flags |= IN_INVENTORY if((item_flags & IN_STORAGE)) // Left storage item but somehow has the bitfield active still. item_flags &= ~(IN_STORAGE) - // if(!initial) - // if(equip_sound && (slot_flags & slot)) - // playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE) - // else if(slot == ITEM_SLOT_HANDS) - // playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE) + if(!initial) + if(equip_sound && (slot_flags & slot)) + playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE) + else if(slot & ITEM_SLOT_HANDS) + playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE) user.update_equipment_speed_mods() diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index a8fe41bb7b..577ec39486 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -29,6 +29,8 @@ buffer = null // simple machine buffer for device linkage toolspeed = 1 usesound = 'sound/weapons/empty.ogg' + drop_sound = 'sound/items/handling/multitool_drop.ogg' + pickup_sound = 'sound/items/handling/multitool_pickup.ogg' var/mode = 0 /obj/item/multitool/chaplain diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 98f19a2f6e..95e7ddd05d 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -12,6 +12,8 @@ custom_materials = list(/datum/material/iron=60, /datum/material/glass=30) force = 2 throwforce = 0 + drop_sound = 'sound/items/handling/taperecorder_drop.ogg' + pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg' var/recording = 0 var/playing = 0 var/playsleepseconds = 0 @@ -288,6 +290,8 @@ custom_materials = list(/datum/material/iron=20, /datum/material/glass=5) force = 1 throwforce = 0 + drop_sound = 'sound/items/handling/tape_drop.ogg' + pickup_sound = 'sound/items/handling/tape_pickup.ogg' var/max_capacity = 600 var/used_capacity = 0 var/list/storedinfo = list() diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 8ddcda55e1..d1ed57ecd1 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -13,6 +13,8 @@ throwforce = 7 w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=50) + drop_sound = 'sound/items/handling/crowbar_drop.ogg' + pickup_sound = 'sound/items/handling/crowbar_pickup.ogg' attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") tool_behaviour = TOOL_CROWBAR diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 9aaffa4009..abd3d4b78c 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -31,6 +31,8 @@ "cyan" = rgb(24, 162, 213), "yellow" = rgb(255, 165, 0) ) + drop_sound = 'sound/items/handling/screwdriver_drop.ogg' + pickup_sound = 'sound/items/handling/screwdriver_pickup.ogg' wound_bonus = -10 bare_wound_bonus = 5 diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 0c8e0db987..b1a1bb3619 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -14,6 +14,8 @@ throwforce = 5 hitsound = "swing_hit" usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg') + drop_sound = 'sound/items/handling/weldingtool_drop.ogg' + pickup_sound = 'sound/items/handling/weldingtool_pickup.ogg' var/acti_sound = 'sound/items/welderactivate.ogg' var/deac_sound = 'sound/items/welderdeactivate.ogg' throw_speed = 3 diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 43648f8435..87d64ba4e9 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -17,6 +17,8 @@ attack_verb = list("pinched", "nipped") hitsound = 'sound/items/wirecutter.ogg' usesound = 'sound/items/wirecutter.ogg' + drop_sound = 'sound/items/handling/wirecutter_drop.ogg' + pickup_sound = 'sound/items/handling/wirecutter_pickup.ogg' tool_behaviour = TOOL_WIRECUTTER toolspeed = 1 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30) diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 8f60ab9d4a..2b2b2fac97 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -13,6 +13,8 @@ w_class = WEIGHT_CLASS_SMALL usesound = 'sound/items/ratchet.ogg' custom_materials = list(/datum/material/iron=150) + drop_sound = 'sound/items/handling/wrench_drop.ogg' + pickup_sound = 'sound/items/handling/wrench_pickup.ogg' attack_verb = list("bashed", "battered", "bludgeoned", "whacked") tool_behaviour = TOOL_WRENCH diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index c51845ab4f..02c8edcec7 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -617,6 +617,8 @@ This is here to make the tiles around the station mininuke change when it's arme righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' icon_state = "datadisk0" w_volume = ITEM_VOLUME_DISK + drop_sound = 'sound/items/handling/disk_drop.ogg' + pickup_sound = 'sound/items/handling/disk_pickup.ogg' /obj/item/disk/nuclear name = "nuclear authentication disk" diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 4a4ee40f60..f51530a972 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -8,6 +8,8 @@ volume = 50 custom_materials = list(/datum/material/glass=500) max_integrity = 20 + drop_sound = 'sound/items/handling/drinkglass_drop.ogg' + pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg' spillable = TRUE resistance_flags = ACID_PROOF obj_flags = UNIQUE_RENAME diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 9b10ea230d..49385e4def 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -34,8 +34,8 @@ resistance_flags = FLAMMABLE max_integrity = 50 dog_fashion = /datum/dog_fashion/head - // drop_sound = 'sound/items/handling/paper_drop.ogg' - // pickup_sound = 'sound/items/handling/paper_pickup.ogg' + drop_sound = 'sound/items/handling/paper_drop.ogg' + pickup_sound = 'sound/items/handling/paper_pickup.ogg' grind_results = list(/datum/reagent/cellulose = 3) color = "white" /// What's actually written on the paper. diff --git a/sound/items/handling/crowbar_drop.ogg b/sound/items/handling/crowbar_drop.ogg new file mode 100644 index 0000000000..7746411066 Binary files /dev/null and b/sound/items/handling/crowbar_drop.ogg differ diff --git a/sound/items/handling/crowbar_pickup.ogg b/sound/items/handling/crowbar_pickup.ogg new file mode 100644 index 0000000000..79b276f845 Binary files /dev/null and b/sound/items/handling/crowbar_pickup.ogg differ diff --git a/sound/items/handling/disk_drop.ogg b/sound/items/handling/disk_drop.ogg new file mode 100644 index 0000000000..3174b88117 Binary files /dev/null and b/sound/items/handling/disk_drop.ogg differ diff --git a/sound/items/handling/disk_pickup.ogg b/sound/items/handling/disk_pickup.ogg new file mode 100644 index 0000000000..8f67406a5f Binary files /dev/null and b/sound/items/handling/disk_pickup.ogg differ diff --git a/sound/items/handling/drinkglass_drop.ogg b/sound/items/handling/drinkglass_drop.ogg new file mode 100644 index 0000000000..43bb732db3 Binary files /dev/null and b/sound/items/handling/drinkglass_drop.ogg differ diff --git a/sound/items/handling/drinkglass_pickup.ogg b/sound/items/handling/drinkglass_pickup.ogg new file mode 100644 index 0000000000..fcd1c7d312 Binary files /dev/null and b/sound/items/handling/drinkglass_pickup.ogg differ diff --git a/sound/items/handling/multitool_drop.ogg b/sound/items/handling/multitool_drop.ogg new file mode 100644 index 0000000000..67e0a41042 Binary files /dev/null and b/sound/items/handling/multitool_drop.ogg differ diff --git a/sound/items/handling/multitool_pickup.ogg b/sound/items/handling/multitool_pickup.ogg new file mode 100644 index 0000000000..cbd598ce89 Binary files /dev/null and b/sound/items/handling/multitool_pickup.ogg differ diff --git a/sound/items/handling/paper_drop.ogg b/sound/items/handling/paper_drop.ogg new file mode 100644 index 0000000000..27ce2b3d1a Binary files /dev/null and b/sound/items/handling/paper_drop.ogg differ diff --git a/sound/items/handling/paper_pickup.ogg b/sound/items/handling/paper_pickup.ogg new file mode 100644 index 0000000000..55ae2b3d2d Binary files /dev/null and b/sound/items/handling/paper_pickup.ogg differ diff --git a/sound/items/handling/tape_drop.ogg b/sound/items/handling/tape_drop.ogg new file mode 100644 index 0000000000..5379a114a7 Binary files /dev/null and b/sound/items/handling/tape_drop.ogg differ diff --git a/sound/items/handling/tape_pickup.ogg b/sound/items/handling/tape_pickup.ogg new file mode 100644 index 0000000000..77f74f19ee Binary files /dev/null and b/sound/items/handling/tape_pickup.ogg differ diff --git a/sound/items/handling/taperecorder_drop.ogg b/sound/items/handling/taperecorder_drop.ogg new file mode 100644 index 0000000000..6e3c151140 Binary files /dev/null and b/sound/items/handling/taperecorder_drop.ogg differ diff --git a/sound/items/handling/taperecorder_pickup.ogg b/sound/items/handling/taperecorder_pickup.ogg new file mode 100644 index 0000000000..941640aefd Binary files /dev/null and b/sound/items/handling/taperecorder_pickup.ogg differ diff --git a/sound/items/handling/weldingtool_drop.ogg b/sound/items/handling/weldingtool_drop.ogg new file mode 100644 index 0000000000..58b722ad7a Binary files /dev/null and b/sound/items/handling/weldingtool_drop.ogg differ diff --git a/sound/items/handling/weldingtool_pickup.ogg b/sound/items/handling/weldingtool_pickup.ogg new file mode 100644 index 0000000000..da78b06b84 Binary files /dev/null and b/sound/items/handling/weldingtool_pickup.ogg differ diff --git a/sound/items/handling/wirecutter_drop.ogg b/sound/items/handling/wirecutter_drop.ogg new file mode 100644 index 0000000000..e099870fc7 Binary files /dev/null and b/sound/items/handling/wirecutter_drop.ogg differ diff --git a/sound/items/handling/wirecutter_pickup.ogg b/sound/items/handling/wirecutter_pickup.ogg new file mode 100644 index 0000000000..078faaf432 Binary files /dev/null and b/sound/items/handling/wirecutter_pickup.ogg differ diff --git a/sound/items/handling/wrench_drop.ogg b/sound/items/handling/wrench_drop.ogg new file mode 100644 index 0000000000..86020bf822 Binary files /dev/null and b/sound/items/handling/wrench_drop.ogg differ diff --git a/sound/items/handling/wrench_pickup.ogg b/sound/items/handling/wrench_pickup.ogg new file mode 100644 index 0000000000..860e0d7087 Binary files /dev/null and b/sound/items/handling/wrench_pickup.ogg differ