diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index db5e6a1d6ae..8339b501b06 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -45,8 +45,8 @@ log_game("\An [assembly] has pulsed a grenade, which was installed by [fingerprint].") var/mob/M = get_mob_by_ckey(fingerprint) var/turf/T = get_turf(M) - G.log_grenade(M, T) - G.prime() + G.log_grenade(M, T) //Used in preprime() too but this one convays where the mob who triggered the bomb is + G.preprime() //The one here convays where the bomb was when it went boom /datum/wires/explosive/chem_grenade/detach_assembly(color) var/obj/item/assembly/S = get_attached(color) diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 6aa7110cb60..cf5f24f3591 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -29,6 +29,8 @@ /obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) . = ..() + if(message_mods[WHISPER_MODE]) //Too quiet lad + return if(speaker == src) return @@ -40,7 +42,7 @@ record_speech(speaker, raw_message, message_language) else if(check_activation(speaker, raw_message)) - addtimer(CALLBACK(src, .proc/pulse, 0), 10) + send_pulse() /obj/item/assembly/voice/proc/record_speech(atom/movable/speaker, raw_message, datum/language/message_language) switch(mode) @@ -58,7 +60,7 @@ say("Your voice pattern is saved.", message_language) if(VOICE_SENSOR_MODE) if(length(raw_message)) - addtimer(CALLBACK(src, .proc/pulse, 0), 10) + send_pulse() /obj/item/assembly/voice/proc/check_activation(atom/movable/speaker, raw_message) . = FALSE @@ -76,6 +78,11 @@ if(length(raw_message)) . = TRUE +/obj/item/assembly/voice/proc/send_pulse() + visible_message("clicks", visible_message_flags = EMOTE_MESSAGE) + playsound(src, 'licensed_sound/Sampling-Plus-1.0/whirthunk.ogg', 30) + addtimer(CALLBACK(src, .proc/pulse), 2 SECONDS) + /obj/item/assembly/voice/multitool_act(mob/living/user, obj/item/I) ..() mode %= modes.len diff --git a/licensed_sound/README.md b/licensed_sound/README.md new file mode 100644 index 00000000000..625b82ecd17 --- /dev/null +++ b/licensed_sound/README.md @@ -0,0 +1 @@ +Each folder here corrosponds to some license used for sound. If you want to add a file that is not licensed under CC BY-SA https://creativecommons.org/licenses/by-sa/3.0/ to the codebase, make a folder here with the info about the license in it, and put the file in said folder. diff --git a/licensed_sound/Sampling-Plus-1.0/README.md b/licensed_sound/Sampling-Plus-1.0/README.md new file mode 100644 index 00000000000..97cb023fc42 --- /dev/null +++ b/licensed_sound/Sampling-Plus-1.0/README.md @@ -0,0 +1,2 @@ +All sounds in this folder are licensed under : https://creativecommons.org/licenses/sampling+/1.0/legalcode +Overview here : https://creativecommons.org/licenses/sampling+/1.0/ diff --git a/licensed_sound/Sampling-Plus-1.0/whirthunk.md b/licensed_sound/Sampling-Plus-1.0/whirthunk.md new file mode 100644 index 00000000000..db4ba0ad37c --- /dev/null +++ b/licensed_sound/Sampling-Plus-1.0/whirthunk.md @@ -0,0 +1,2 @@ +From: https://freesound.org/people/engreitz/sounds/79021/ +Copyright of: https://freesound.org/people/engreitz/ diff --git a/licensed_sound/Sampling-Plus-1.0/whirthunk.ogg b/licensed_sound/Sampling-Plus-1.0/whirthunk.ogg new file mode 100644 index 00000000000..6370068a49c Binary files /dev/null and b/licensed_sound/Sampling-Plus-1.0/whirthunk.ogg differ