diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index f467a879ac..db705ac53a 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -217,11 +217,11 @@ datum/controller/vote
world << "[text]\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote."
switch(vote_type)
if("crew_transfer")
- world << sound('sound/voice/Serithi/Shuttlehere.ogg')
+ world << sound('sound/ambience/alarm4.ogg')
if("gamemode")
- world << sound('sound/voice/Serithi/pretenddemoc.ogg')
+ world << sound('sound/ambience/alarm4.ogg')
if("custom")
- world << sound('sound/voice/Serithi/weneedvote.ogg')
+ world << sound('sound/ambience/alarm4.ogg')
if(mode == "gamemode" && going)
going = 0
world << "Round start has been delayed."
@@ -231,6 +231,20 @@ datum/controller/vote
world << "The OOC channel has been automatically disabled due to the crew transfer vote."
log_admin("OOC was toggled automatically due to crew_transfer vote.")
message_admins("OOC has been toggled off automatically.")
+ if(mode == "gamemode" && ooc_allowed)
+ auto_muted = 1
+ ooc_allowed = !( ooc_allowed )
+ world << "The OOC channel has been automatically disabled due to the gamemode vote."
+ log_admin("OOC was toggled automatically due to gamemode vote.")
+ message_admins("OOC has been toggled off automatically.")
+ if(mode == "custom" && ooc_allowed)
+ auto_muted = 1
+ ooc_allowed = !( ooc_allowed )
+ world << "The OOC channel has been automatically disabled due to the custom vote."
+ log_admin("OOC was toggled automatically due to custom vote.")
+ message_admins("OOC has been toggled off automatically.")
+
+
time_remaining = round(config.vote_period/10)
diff --git a/code/modules/DetectiveWork/scanner.dm b/code/modules/DetectiveWork/scanner.dm
index 7bafd4a31f..448425e454 100644
--- a/code/modules/DetectiveWork/scanner.dm
+++ b/code/modules/DetectiveWork/scanner.dm
@@ -34,9 +34,11 @@
attack(mob/living/carbon/human/M as mob, mob/user as mob)
if (!ishuman(M))
user << "\red [M] is not human and cannot have the fingerprints."
+ flick("forensic0",src)
return 0
if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
user << "\blue No fingerprints found on [M]"
+ flick("forensic0",src)
return 0
else
if (src.amount < 1)
@@ -71,6 +73,7 @@
return
if(istype(A,/obj/item/weapon/f_card))
user << "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\""
+ flick("forensic0",src)
return
add_fingerprint(user)
@@ -81,6 +84,7 @@
if(!isnull(A.blood_DNA))
for(var/blood in A.blood_DNA)
user << "\blue Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"
+ flick("forensic2",src)
return
//General
@@ -88,10 +92,12 @@
user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
"\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\
"You hear a faint hum of electrical equipment.")
+ flick("forensic0",src)
return 0
if(add_data(A))
user << "\blue Object already in internal memory. Consolidating data..."
+ flick("forensic2",src)
return
@@ -116,6 +122,7 @@
//FIBERS
if(A.suit_fibers)
user << "\blue Fibers/Materials Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+ flick("forensic2",src)
//Blood
if (A.blood_DNA)
@@ -127,11 +134,13 @@
user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
"You finish scanning \the [A].",\
"You hear a faint hum of electrical equipment.")
+ flick("forensic2",src)
return 0
else
user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]\n[user.gender == MALE ? "He" : "She"] seems to perk up slightly at the readout." ,\
"The results of the scan pique your interest.",\
"You hear a faint hum of electrical equipment, and someone making a thoughtful noise.")
+ flick("forensic2",src)
return 0
return
diff --git a/sound/ambience/alarm4.ogg b/sound/ambience/alarm4.ogg
new file mode 100644
index 0000000000..a86bfd155f
Binary files /dev/null and b/sound/ambience/alarm4.ogg differ