Merge pull request #5660 from CHOMPStation2/upstream-merge-14439

[MIRROR] Some post-mirror fixes

code/modules/emotes/definitions/audible.dm

@@ -200,10 +200,10 @@
 	emote_message_3p = "lets out a low, throaty warble!"
 	emote_sound = 'sound/voice/lwarble.ogg'
 
-/decl/emote/audible/croak
-	key = "croak"
+/decl/emote/audible/croak_skrell
+	key = "scroak"
 	emote_message_3p = "croaks!"
-	emote_sound = 'sound/voice/croak.ogg'
+	emote_sound = 'sound/voice/croak_skrell.ogg'
 
 /decl/emote/audible/vox_shriek
 	key = "shriek"

code/modules/emotes/definitions/audible_furry_vr.dm

@@ -123,7 +123,7 @@
 /decl/emote/audible/croak
     key = "croak"
     emote_message_3p = "rumbles their throat, puffs their cheeks and croaks."
-    emote_sound = 'sound/voice/Croak.ogg'
+    emote_sound = 'sound/voice/croak_frog.ogg'
 /decl/emote/audible/gao
     key = "gao"
     emote_message_3p = "lets out a gao."

code/modules/mob/living/carbon/human/emote.dm

@@ -168,6 +168,9 @@ var/list/_human_default_emotes = list(
 	/decl/emote/visible/jiggle,
 	/decl/emote/visible/lightup,
 	/decl/emote/visible/vibrate,
+	/decl/emote/audible/croon,
+	/decl/emote/audible/lwarble,
+	/decl/emote/audible/croak_skrell,
 	//VOREStation Add End
 	//CHOMP Add start
 	/decl/emote/audible/prbt2

vorestation.dme

@@ -1780,6 +1780,7 @@
 #include "code\modules\admin\create_mob.dm"
 #include "code\modules\admin\create_object.dm"
 #include "code\modules\admin\create_turf.dm"
+#include "code\modules\admin\fix_player_notes_listing.dm"
 #include "code\modules\admin\holder2.dm"
 #include "code\modules\admin\IsBanned.dm"
 #include "code\modules\admin\map_capture.dm"