From 9fbd9b2caf8a96e65c06ed53a30f37aceeeffbe3 Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Sun, 15 Mar 2020 17:20:02 +0000 Subject: [PATCH] prefs/tweaks --- code/defines/procs/announce.dm | 2 +- code/game/objects/items.dm | 4 ++-- code/modules/lore_codex/codex.dm | 2 +- code/modules/mob/living/inventory.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index a8b196aef5..125601af4a 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -131,5 +131,5 @@ datum/announcement/proc/Log(message as text, message_title as text) AnnounceArrivalSimple(character.real_name, rank, join_message) -/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle", var/new_sound = 'sound/misc/notice3.ogg') +/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle", new_sound = 'sound/misc/notice3.ogg') global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer") diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c8d24120b6..ec178a7709 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -278,8 +278,8 @@ /obj/item/throw_impact(atom/hit_atom) ..() - if(drop_sound && usr.is_preference_enabled(/datum/client_preference/drop_sounds)) - playsound(src, drop_sound, 50, 0) + if(drop_sound) + playsound(src, drop_sound, 50, 0, preference = /datum/client_preference/drop_sounds) // apparently called whenever an item is removed from a slot, container, or anything else. /obj/item/proc/dropped(mob/user as mob) diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm index 140f78f915..8aae028a20 100644 --- a/code/modules/lore_codex/codex.dm +++ b/code/modules/lore_codex/codex.dm @@ -39,7 +39,7 @@ w_class = ITEMSIZE_SMALL root_type = /datum/lore/codex/category/main_news libcategory = "Reference" - + drop_sound = 'sound/items/drop/device.ogg' // Combines SOP/Regs/Law /obj/item/weapon/book/codex/corp_regs name = "NanoTrasen Regulatory Compendium" diff --git a/code/modules/mob/living/inventory.dm b/code/modules/mob/living/inventory.dm index 123c21c537..22db034374 100644 --- a/code/modules/mob/living/inventory.dm +++ b/code/modules/mob/living/inventory.dm @@ -50,7 +50,7 @@ return if(I.drop_sound) - playsound(I, I.drop_sound, 25, 0) + playsound(I, I.drop_sound, 25, 0, preference = /datum/client_preference/drop_sounds) //Drops the item in our left hand