Additional voicelines (incomplete).

FuturePlans.md

@@ -33,10 +33,10 @@ More weapons, because we need 'em. In addition, all the "easy to implement" mini
   - Minesweeper
   - Solitaire
 * ☐ **Additional Voice Acting:**
-  - Extra lines for item pickups/usage
-  - Additional taunts and others
+  - ✓ Extra lines for item pickups/usage
+  - ✓ Additional taunts and others
   - Reactions to hurtfloor damage
-  - Caco petting
+  - ✓ Caco petting
   - Explosion lines
   - Lead ball crit lines
   - Buttslam lines

language.def_voice

@@ -18,13 +18,14 @@ SWWM_SUBS_DEFAULT_GETWEAPON11 = "I'll be taking this.";
 SWWM_SUBS_DEFAULT_GETWEAPON12 = "New gun, more fun.";
 SWWM_SUBS_DEFAULT_GETWEAPON13 = "You're coming with me.";
 // locked door
-SWWM_SUBS_DEFAULT_NLOCKED = "6";
+SWWM_SUBS_DEFAULT_NLOCKED = "7";
 SWWM_SUBS_DEFAULT_LOCKED1 = "Welp, it's locked.";
 SWWM_SUBS_DEFAULT_LOCKED2 = "Gonna need a key for this.";
 SWWM_SUBS_DEFAULT_LOCKED3 = "Gotta find a key.";
 SWWM_SUBS_DEFAULT_LOCKED4 = "Needs a key.";
 SWWM_SUBS_DEFAULT_LOCKED5 = "God I hate keyhunts...";
 SWWM_SUBS_DEFAULT_LOCKED6 = "Goddamn keys...";
+SWWM_SUBS_DEFAULT_LOCKED7 = "What fresh bullfuckery is this?";
 // jammed door
 SWWM_SUBS_DEFAULT_NJAMMED = "7";
 SWWM_SUBS_DEFAULT_JAMMED1 = "Stuck.";
@@ -51,7 +52,7 @@ SWWM_SUBS_DEFAULT_PUZZSUCC4 = "Good.";
 SWWM_SUBS_DEFAULT_PUZZSUCC5 = "Yeah, that's it.";
 SWWM_SUBS_DEFAULT_PUZZSUCC6 = "Abracadabra.";
 // first enemy encounter (20 seconds cooldown since all enemies dead)
-SWWM_SUBS_DEFAULT_NFIGHTSTART = "21";
+SWWM_SUBS_DEFAULT_NFIGHTSTART = "22";
 SWWM_SUBS_DEFAULT_FIGHTSTART1 = "Oh boy here we go.";
 SWWM_SUBS_DEFAULT_FIGHTSTART2 = "Alright, let's party.";
 SWWM_SUBS_DEFAULT_FIGHTSTART3 = "Oh, more baddies.";
@@ -73,8 +74,9 @@ SWWM_SUBS_DEFAULT_FIGHTSTART18 = "Oh, finally, something to shoot.";
 SWWM_SUBS_DEFAULT_FIGHTSTART19 = "It's showtime!";
 SWWM_SUBS_DEFAULT_FIGHTSTART20 = "Oh, you're dead.";
 SWWM_SUBS_DEFAULT_FIGHTSTART21 = "Good. Was wondering when you'd show up.";
+SWWM_SUBS_DEFAULT_FIGHTSTART22 = "Ah shit, here we go again.";
 // played at map start
-SWWM_SUBS_DEFAULT_NMAPSTART = "14";
+SWWM_SUBS_DEFAULT_NMAPSTART = "17";
 SWWM_SUBS_DEFAULT_MAPSTART1 = "Ugh, fuck... This place reeks. I'd vomit if I could.";
 SWWM_SUBS_DEFAULT_MAPSTART2 = "Alright, let's get to work.";
 SWWM_SUBS_DEFAULT_MAPSTART3 = "Mission... start?";
@@ -89,6 +91,9 @@ SWWM_SUBS_DEFAULT_MAPSTART11 = "Well, let's not keep everyone waiting.";
 SWWM_SUBS_DEFAULT_MAPSTART12 = "I'll do my best.";
 SWWM_SUBS_DEFAULT_MAPSTART13 = "Let me say this: Anything I find, I keep.";
 SWWM_SUBS_DEFAULT_MAPSTART14 = "I'm here to chew bubblegum and kick ass... And I don't have a mouth.";
+SWWM_SUBS_DEFAULT_MAPSTART15 = "Why did I move here? I guess it was the weather.";
+SWWM_SUBS_DEFAULT_MAPSTART16 = "Ugh I hope there's no frickin' platforming...";
+SWWM_SUBS_DEFAULT_MAPSTART17 = "Now I can tell this is gonna be an interesting day.";
 // every time a secret is found
 SWWM_SUBS_DEFAULT_NFINDSECRET = "13";
 SWWM_SUBS_DEFAULT_FINDSECRET1 = "Oh, that was a secret?";
@@ -105,7 +110,7 @@ SWWM_SUBS_DEFAULT_FINDSECRET11 = "That was good, wasn't it?";
 SWWM_SUBS_DEFAULT_FINDSECRET12 = "Lucky me, huh?";
 SWWM_SUBS_DEFAULT_FINDSECRET13 = "Well, I mean, I'm pretty good at this.";
 // frag taunts
-SWWM_SUBS_DEFAULT_NSCOREKILL = "25";
+SWWM_SUBS_DEFAULT_NSCOREKILL = "27";
 SWWM_SUBS_DEFAULT_SCOREKILL1 = "Get out.";
 SWWM_SUBS_DEFAULT_SCOREKILL2 = "One done.";
 SWWM_SUBS_DEFAULT_SCOREKILL3 = "Bye bye.";
@@ -131,6 +136,8 @@ SWWM_SUBS_DEFAULT_SCOREKILL22 = "You're welcome.";
 SWWM_SUBS_DEFAULT_SCOREKILL23 = "Out of my way.";
 SWWM_SUBS_DEFAULT_SCOREKILL24 = "Here's your special serving of DIE.";
 SWWM_SUBS_DEFAULT_SCOREKILL25 = "Want more?";
+SWWM_SUBS_DEFAULT_SCOREKILL26 = "Get rekt.";
+SWWM_SUBS_DEFAULT_SCOREKILL27 = "Now that's what I call a BRUH moment.";
 // oopsies
 SWWM_SUBS_DEFAULT_NFRIENDKILL = "4";
 SWWM_SUBS_DEFAULT_FRIENDKILL1 = "Oh no! No no no no I'm sorry oh my god!";
@@ -138,7 +145,7 @@ SWWM_SUBS_DEFAULT_FRIENDKILL2 = "Oh my god! I'm so sorry...";
 SWWM_SUBS_DEFAULT_FRIENDKILL3 = "Oh... no...";
 SWWM_SUBS_DEFAULT_FRIENDKILL4 = "Oh my god no no no please...";
 // getting hurt by monsters
-SWWM_SUBS_DEFAULT_NGETHIT = "19";
+SWWM_SUBS_DEFAULT_NGETHIT = "20";
 SWWM_SUBS_DEFAULT_GETHIT1 = "Ow! Fuck you!";
 SWWM_SUBS_DEFAULT_GETHIT2 = "*sigh*";
 SWWM_SUBS_DEFAULT_GETHIT3 = "Yeah, lucky hit. Now die.";
@@ -158,6 +165,7 @@ SWWM_SUBS_DEFAULT_GETHIT16 = "You are already dead...";
 SWWM_SUBS_DEFAULT_GETHIT17 = "You're not getting out of here alive.";
 SWWM_SUBS_DEFAULT_GETHIT18 = "Okay, I get it.";
 SWWM_SUBS_DEFAULT_GETHIT19 = "Ugh! Just... fuck... off...";
+SWWM_SUBS_DEFAULT_GETHIT20 = "You sussy baka...!";
 // getting hurt by friendlies
 SWWM_SUBS_DEFAULT_NFRIENDHIT = "7";
 SWWM_SUBS_DEFAULT_FRIENDHIT1 = "Hey what was that about?";
@@ -289,7 +297,7 @@ SWWM_SUBS_DEFAULT_GETPLASMABLAST1 = "Blastin' plasma.";
 SWWM_SUBS_DEFAULT_GETPLASMABLAST2 = "Now we're talking. Double the fun.";
 SWWM_SUBS_DEFAULT_GETPUNTZERBETA = "Gonna drill some sense into y'all.";	// said with a cheap cowboy accent
 SWWM_SUBS_DEFAULT_GETPUNTZERGAMMA = "Full auto and... fuller auto? Oh my...";
-SWWM_SUBS_DEFAULT_GETHEAVYMAHSHEENGUN = "Heavy Machine Gun!";
+SWWM_SUBS_DEFAULT_GETHEAVYMAHSHEENGUN = "Now I have a machine gun. Hohohoh~";
 SWWM_SUBS_DEFAULT_GETQUADRAVOL = "For the flames of the Ardent Cross spread throughout the horde...";
 SWWM_SUBS_DEFAULT_GETNEWSPARKSTER = "I like big plasma weapons.";
 SWWM_SUBS_DEFAULT_GETMORTALRIFLE = "Welcome aboard, Mister.";
@@ -321,6 +329,7 @@ SWWM_SUBS_DEFAULT_NUTATCOGET = "NUTATCO?";
 SWWM_SUBS_DEFAULT_FRISPYGET = "*giggle* Sayacchi's top snack.";
 SWWM_SUBS_DEFAULT_SAYAGET = "Squishy bean...";
 SWWM_SUBS_DEFAULT_MOTHGET = "Ah, Sayacchi's waifu.";
+SWWM_SUBS_DEFAULT_MUGGET = "Mussy...";
 SWWM_SUBS_DEFAULT_DEMOGET = "Hehehe, my own plushie.";
 SWWM_SUBS_DEFAULT_PEACHGET = "Wait, this is... *snicker*";
 SWWM_SUBS_DEFAULT_BREADGET = "Soft, squishy buns...";
@@ -404,6 +413,44 @@ SWWM_SUBS_DEFAULT_BUTTONPUSH2 = "Boop.";
 SWWM_SUBS_DEFAULT_BUTTONPUSH3 = "Bop.";
 // Fall "scream"
 SWWM_SUBS_DEFAULT_FALLING = "Wheeeeeeeeeee~!";
+/// Special kill messages (rare)
+// Buttslam
+SWWM_SUBS_DEFAULT_NASSKILL = "2";
+SWWM_SUBS_DEFAULT_ASSKILL1 = "It's ASS time!";
+SWWM_SUBS_DEFAULT_ASSKILL2 = "Putting the ASS in mASSacre!";
+// Lead ball crit
+SWWM_SUBS_DEFAULT_NBALLSKILL = "2";
+SWWM_SUBS_DERFAULT_BALLSKILL1 = "Dangerous Ball Action!";
+SWWM_SUBS_DERFAULT_BALLSKILL2 = "Be careful playing with your balls, lads!";
+// Explosion kill
+SWWM_SUBS_DEFAULT_NBLAST = "6";
+SWWM_SUBS_DEFAULT_BLAST1 = "Bang!";
+SWWM_SUBS_DEFAULT_BLAST2 = "Bangabangbangbang!";
+SWWM_SUBS_DEFAULT_BLAST3 = "Pew!";
+SWWM_SUBS_DEFAULT_BLAST4 = "Boom!";
+SWWM_SUBS_DEFAULT_BLAST5 = "Kapow!";
+SWWM_SUBS_DEFAULT_BLAST6 = "Kaboom.";
+// Cacodemon petting
+SWWM_SUBS_DEFAULT_NPETCACO = "3";
+SWWM_SUBS_DEFAULT_PETCACO1 = "Caco!";
+SWWM_SUBS_DEFAULT_PETCACO2 = "Who's a good caco boy?";
+SWWM_SUBS_DEFAULT_PETCACO3 = "Meatball~";
+// (rare) skull key pickup gesture
+SWWM_SUBS_DEFAULT_SKULLGET = "Alas, poor Yorick. I knew him, Horatio.";
+// Grilled Cheese Sandwich eating
+SWWM_SUBS_DEFAULT_NEAT = "5";
+SWWM_SUBS_DEFAULT_EAT1 = "Om nom nom... Om nom...";
+SWWM_SUBS_DEFAULT_EAT2 = "*eating*";
+SWWM_SUBS_DEFAULT_EAT3 = "Mmmmm...";
+SWWM_SUBS_DEFAULT_EAT4 = "Mmmm! Tasty!";
+SWWM_SUBS_DEFAULT_EAT5 = "Mah favorite!";
+// Hurtfloor damage
+SWWM_SUBS_DEFAULT_NHURTFLOOR = "5";
+SWWM_SUBS_DEFAULT_HURTFLOOR1 = "Ffffff...";
+SWWM_SUBS_DEFAULT_HURTFLOOR2 = "Huff oof...";
+SWWM_SUBS_DEFAULT_HURTFLOOR3 = "Oooo ooo... Aaa aaah ooh...";
+SWWM_SUBS_DEFAULT_HURTFLOOR4 = "Ooh ah aahh... Ooh...";
+SWWM_SUBS_DEFAULT_HURTFLOOR5 = "Hot...";
 //// LEGACY VOICE - Fallout 4 JP Sole Survivor
 SWWM_VOICENAME_LEGACY = "Classic";
 // new weapon received

language.es_voice

@@ -21,6 +21,7 @@ SWWM_SUBS_DEFAULT_LOCKED3 = "Tengo que encontrar la llave.";
 SWWM_SUBS_DEFAULT_LOCKED4 = "Necesita una llave.";
 SWWM_SUBS_DEFAULT_LOCKED5 = "Dios odio buscar llaves...";
 SWWM_SUBS_DEFAULT_LOCKED6 = "Malditas llaves...";
+SWWM_SUBS_DEFAULT_LOCKED7 = "¿Pero que mierdas es esto?";
 // jammed door
 SWWM_SUBS_DEFAULT_JAMMED1 = "Atascado.";
 SWWM_SUBS_DEFAULT_JAMMED2 = "No se mueve.";
@@ -62,6 +63,7 @@ SWWM_SUBS_DEFAULT_FIGHTSTART18 = "Oh, por fin, algo que disparar.";
 SWWM_SUBS_DEFAULT_FIGHTSTART19 = "¡Empieza el show!";
 SWWM_SUBS_DEFAULT_FIGHTSTART20 = "Oh, estás muerto.";
 SWWM_SUBS_DEFAULT_FIGHTSTART21 = "Bien. Ya me preguntaba cuando ibas a aparecer.";
+SWWM_SUBS_DEFAULT_FIGHTSTART22 = "Oh mierda, allá vamos otra vez.";
 // played at map start
 SWWM_SUBS_DEFAULT_MAPSTART1 = "Ugh, joder... Este sitio apesta. Vomitaría si pudiera.";
 SWWM_SUBS_DEFAULT_MAPSTART2 = "Muy bien, manos a la obra.";
@@ -77,6 +79,9 @@ SWWM_SUBS_DEFAULT_MAPSTART11 = "Bueno, mas vale no dejar a todos esperando.";
 SWWM_SUBS_DEFAULT_MAPSTART12 = "Me esforzaré al máximo.";
 SWWM_SUBS_DEFAULT_MAPSTART13 = "Deja que diga una cosa: Todo lo que encuentre, me lo quedo.";
 SWWM_SUBS_DEFAULT_MAPSTART14 = "Vengo a mascar chicle y patear traseros... Y no tengo boca.";
+SWWM_SUBS_DEFAULT_MAPSTART15 = "¿Por qué me mudé aquí? Supongo que por el tiempo.";
+SWWM_SUBS_DEFAULT_MAPSTART16 = "Ugh mas vale que no haya plataformas...";
+SWWM_SUBS_DEFAULT_MAPSTART17 = "Ya veo que este día va a ser interesante.";
 // every time a secret is found
 SWWM_SUBS_DEFAULT_FINDSECRET1 = "Oh, ¿eso era un secreto?";
 SWWM_SUBS_DEFAULT_FINDSECRET2 = "Sí, molo bastante.";
@@ -116,6 +121,8 @@ SWWM_SUBS_DEFAULT_SCOREKILL22 = "Un placer.";
 SWWM_SUBS_DEFAULT_SCOREKILL23 = "Fuera de mi camino.";
 SWWM_SUBS_DEFAULT_SCOREKILL24 = "Aquí tienes tu ración especial de MUERE.";
 SWWM_SUBS_DEFAULT_SCOREKILL25 = "¿Quieres más?";
+SWWM_SUBS_DEFAULT_SCOREKILL26 = "A joderse.";
+SWWM_SUBS_DEFAULT_SCOREKILL27 = "Eso si que lo llamo un momento BRUH.";
 // oopsies
 SWWM_SUBS_DEFAULT_FRIENDKILL1 = "¡Oh no! ¡No no no no lo siento oh dios mío!";
 SWWM_SUBS_DEFAULT_FRIENDKILL2 = "¡Oh dios mío! Lo siento mucho...";
@@ -140,6 +147,7 @@ SWWM_SUBS_DEFAULT_GETHIT16 = "Ya estás muerto...";
 SWWM_SUBS_DEFAULT_GETHIT17 = "No vas a salir de aquí con vida.";
 SWWM_SUBS_DEFAULT_GETHIT18 = "Vale, ya lo pillo.";
 SWWM_SUBS_DEFAULT_GETHIT19 = "¡Ugh! Puto... déjame... joder...";
+SWWM_SUBS_DEFAULT_GETHIT20 = "¡Pero serás sussy baka...!";
 // getting hurt by friendlies
 SWWM_SUBS_DEFAULT_FRIENDHIT1 = "¿Eh a que ha venido eso?";
 SWWM_SUBS_DEFAULT_FRIENDHIT2 = "¿Que estas haciendo?";
@@ -261,7 +269,7 @@ SWWM_SUBS_DEFAULT_GETPLASMABLAST1 = "Soltando plasma.";
 SWWM_SUBS_DEFAULT_GETPLASMABLAST2 = "Ahora sí. El doble de diversión.";
 SWWM_SUBS_DEFAULT_GETPUNTZERBETA = "Os voy a taladrar bien taladrados.";	// said with a cheap cowboy accent
 SWWM_SUBS_DEFAULT_GETPUNTZERGAMMA = "¿Automático y... superautomático? Vaya vaya...";
-SWWM_SUBS_DEFAULT_GETHEAVYMAHSHEENGUN = "¡Metralleta Pesada!";
+SWWM_SUBS_DEFAULT_GETHEAVYMAHSHEENGUN = "Ahora tengo una ametralladora. Jojojo~";
 SWWM_SUBS_DEFAULT_GETQUADRAVOL = "Así las llamas de la Cruz Ardiente se propagaron a través de la horda...";
 SWWM_SUBS_DEFAULT_GETNEWSPARKSTER = "Me gustan las armas de plasma grandes.";
 SWWM_SUBS_DEFAULT_GETMORTALRIFLE = "Bienvenido a bordo, Míster.";
@@ -362,6 +370,42 @@ SWWM_SUBS_DEFAULT_BUTTONPUSH1 = "Bip.";
 SWWM_SUBS_DEFAULT_BUTTONPUSH2 = "Bup.";
 // Fall "scream"
 SWWM_SUBS_DEFAULT_FALLING = "¡Wiiiiiiiiiiii~!";
+/// Special kill messages (rare)
+// Buttslam
+SWWM_SUBS_DEFAULT_NASSKILL = "2";
+SWWM_SUBS_DEFAULT_ASSKILL1 = "¡Es hora del CULO!";
+SWWM_SUBS_DEFAULT_ASSKILL2 = "¡Masacrando con las nalgas!";
+// Lead ball crit
+SWWM_SUBS_DEFAULT_NBALLSKILL = "2";
+SWWM_SUBS_DERFAULT_BALLSKILL1 = "¡Peligrosa Acción de Pelotas!";
+SWWM_SUBS_DERFAULT_BALLSKILL2 = "¡Cuidado al jugar con vuestras pelotas, chavales!";
+// Explosion kill
+SWWM_SUBS_DEFAULT_NBLAST = "6";
+SWWM_SUBS_DEFAULT_BLAST1 = "¡Bang!";
+SWWM_SUBS_DEFAULT_BLAST2 = "¡Bangabangbangbang!";
+SWWM_SUBS_DEFAULT_BLAST3 = "¡Píu!";
+SWWM_SUBS_DEFAULT_BLAST4 = "¡Bum!";
+SWWM_SUBS_DEFAULT_BLAST5 = "¡Kapow!";
+SWWM_SUBS_DEFAULT_BLAST6 = "Kabúm.";
+// Cacodemon petting
+SWWM_SUBS_DEFAULT_NPETCACO = "3";
+SWWM_SUBS_DEFAULT_PETCACO1 = "¡Caco!";
+SWWM_SUBS_DEFAULT_PETCACO2 = "¿Quien es un buen cacodemonio?";
+SWWM_SUBS_DEFAULT_PETCACO3 = "Albondiguilla~";
+// (rare) skull key pickup gesture
+SWWM_SUBS_DEFAULT_SKULLGET = "Ay, probre Yorick. Yo le conocía, Horacio.";
+// Grilled Cheese Sandwich eating
+SWWM_SUBS_DEFAULT_NEAT = "5";
+SWWM_SUBS_DEFAULT_EAT1 = "Ñam ñam ñam... Ñam ñam...";
+SWWM_SUBS_DEFAULT_EAT2 = "*comiendo*";
+SWWM_SUBS_DEFAULT_EAT4 = "¡Mmmm! ¡Rico!";
+SWWM_SUBS_DEFAULT_EAT5 = "¡Mi favorito!";
+// Hurtfloor damage
+SWWM_SUBS_DEFAULT_NHURTFLOOR = "5";
+SWWM_SUBS_DEFAULT_HURTFLOOR2 = "Buf uf...";
+SWWM_SUBS_DEFAULT_HURTFLOOR3 = "Uuuu uuu... Aaa aaaa ooo...";
+SWWM_SUBS_DEFAULT_HURTFLOOR4 = "Uuu aa aaaa... Ooo...";
+SWWM_SUBS_DEFAULT_HURTFLOOR5 = "Quema...";
 //// LEGACY VOICE - Fallout 4 JP Sole Survivor
 // voice name
 SWWM_VOICENAME_DEFAULT = "Clásico";

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r8 \cu(Tue 29 Mar 16:52:12 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r8 \cu(2022-03-29 16:52:12)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r9 \cu(Tue 29 Mar 22:35:06 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r9 \cu(2022-03-29 22:35:06)\c-";

sndinfo.txt

@@ -111,6 +111,7 @@ voice/default/fightstart18	sounds/voice/default/va/demofightstart18.ogg
 voice/default/fightstart19	sounds/voice/default/va/demofightstart19.ogg
 voice/default/fightstart20	sounds/voice/default/va/demofightstart20.ogg
 voice/default/fightstart21	sounds/voice/default/va/demofightstart21.ogg
+voice/default/fightstart22	sounds/voice/default/va/demofightstart22.ogg
 voice/default/findsecret1 	sounds/voice/default/va/demofindsecret1.ogg
 voice/default/findsecret2 	sounds/voice/default/va/demofindsecret2.ogg
 voice/default/findsecret3 	sounds/voice/default/va/demofindsecret3.ogg
@@ -143,6 +144,7 @@ voice/default/locked3     	sounds/voice/default/va/demolocked3.ogg
 voice/default/locked4     	sounds/voice/default/va/demolocked4.ogg
 voice/default/locked5     	sounds/voice/default/va/demolocked5.ogg
 voice/default/locked6     	sounds/voice/default/va/demolocked6.ogg
+voice/default/locked7     	sounds/voice/default/va/demolocked7.ogg
 voice/default/jammed1     	sounds/voice/default/va/demojammed1.ogg
 voice/default/jammed2     	sounds/voice/default/va/demojammed2.ogg
 voice/default/jammed3     	sounds/voice/default/va/demojammed3.ogg
@@ -164,6 +166,9 @@ voice/default/mapstart11  	sounds/voice/default/va/demomapstart11.ogg
 voice/default/mapstart12  	sounds/voice/default/va/demomapstart12.ogg
 voice/default/mapstart13  	sounds/voice/default/va/demomapstart13.ogg
 voice/default/mapstart14  	sounds/voice/default/va/demomapstart14.ogg
+voice/default/mapstart15  	sounds/voice/default/va/demomapstart15.ogg
+voice/default/mapstart16  	sounds/voice/default/va/demomapstart16.ogg
+voice/default/mapstart17  	sounds/voice/default/va/demomapstart17.ogg
 voice/default/puzzfail1   	sounds/voice/default/va/demopuzzfail1.ogg
 voice/default/puzzfail2   	sounds/voice/default/va/demopuzzfail2.ogg
 voice/default/puzzfail3   	sounds/voice/default/va/demopuzzfail3.ogg
@@ -201,6 +206,8 @@ voice/default/scorekill22 	sounds/voice/default/va/demoscorekill22.ogg
 voice/default/scorekill23 	sounds/voice/default/va/demoscorekill23.ogg
 voice/default/scorekill24 	sounds/voice/default/va/demoscorekill24.ogg
 voice/default/scorekill25 	sounds/voice/default/va/demoscorekill25.ogg
+voice/default/scorekill26 	sounds/voice/default/va/demoscorekill26.ogg
+voice/default/scorekill27 	sounds/voice/default/va/demoscorekill27.ogg
 voice/default/friendkill1	sounds/voice/default/va/demofriendkill1.ogg
 voice/default/friendkill2	sounds/voice/default/va/demofriendkill2.ogg
 voice/default/friendkill3	sounds/voice/default/va/demofriendkill3.ogg
@@ -224,6 +231,7 @@ voice/default/gethit16 		sounds/voice/default/va/demogethit16.ogg
 voice/default/gethit17 		sounds/voice/default/va/demogethit17.ogg
 voice/default/gethit18 		sounds/voice/default/va/demogethit18.ogg
 voice/default/gethit19 		sounds/voice/default/va/demogethit19.ogg
+voice/default/gethit20 		sounds/voice/default/va/demogethit20.ogg
 voice/default/friendhit1	sounds/voice/default/va/demofriendhit1.ogg
 voice/default/friendhit2	sounds/voice/default/va/demofriendhit2.ogg
 voice/default/friendhit3	sounds/voice/default/va/demofriendhit3.ogg
@@ -371,6 +379,7 @@ voice/default/nutatcoget	sounds/voice/default/va/demonutatcoget.ogg
 voice/default/frispyget		sounds/voice/default/va/demofrispyget.ogg
 voice/default/sayaget		sounds/voice/default/va/demosayaget.ogg
 voice/default/mothget		sounds/voice/default/va/demomothget.ogg
+voice/default/mugget		sounds/voice/default/va/demomugget.ogg
 voice/default/demoget		sounds/voice/default/va/demodemoget.ogg
 voice/default/peachget		sounds/voice/default/va/demopeachget.ogg
 voice/default/breadget		sounds/voice/default/va/demobreadget.ogg
@@ -436,6 +445,30 @@ voice/default/buttonpush1	sounds/voice/default/va/demobuttonpush1.ogg
 voice/default/buttonpush2	sounds/voice/default/va/demobuttonpush2.ogg
 voice/default/buttonpush3	sounds/voice/default/va/demobuttonpush3.ogg
 voice/default/falling		sounds/voice/default/va/demofalling.ogg
+voice/default/asskill1		sounds/voice/default/va/demoasskill1.ogg
+voice/default/asskill2		sounds/voice/default/va/demoasskill2.ogg
+voice/default/ballskill1	sounds/voice/default/va/demoballskill1.ogg
+voice/default/ballskill2	sounds/voice/default/va/demoballskill2.ogg
+voice/default/blast1		sounds/voice/default/va/demoblast1.ogg
+voice/default/blast2		sounds/voice/default/va/demoblast2.ogg
+voice/default/blast3		sounds/voice/default/va/demoblast3.ogg
+voice/default/blast4		sounds/voice/default/va/demoblast4.ogg
+voice/default/blast5		sounds/voice/default/va/demoblast5.ogg
+voice/default/blast6		sounds/voice/default/va/demoblast6.ogg
+voice/default/petcaco1		sounds/voice/default/va/demopetcaco1.ogg
+voice/default/petcaco2		sounds/voice/default/va/demopetcaco2.ogg
+voice/default/petcaco3		sounds/voice/default/va/demopetcaco3.ogg
+voice/default/skullget		sounds/voice/default/va/demoskullget.ogg
+voice/default/eat1		sounds/voice/default/va/demoeat1.ogg
+voice/default/eat2		sounds/voice/default/va/demoeat2.ogg
+voice/default/eat3		sounds/voice/default/va/demoeat3.ogg
+voice/default/eat4		sounds/voice/default/va/demoeat4.ogg
+voice/default/eat5		sounds/voice/default/va/demoeat5.ogg
+voice/default/hurtfloor1	sounds/voice/default/va/demohurtfloor1.ogg
+voice/default/hurtfloor2	sounds/voice/default/va/demohurtfloor2.ogg
+voice/default/hurtfloor3	sounds/voice/default/va/demohurtfloor3.ogg
+voice/default/hurtfloor4	sounds/voice/default/va/demohurtfloor4.ogg
+voice/default/hurtfloor5	sounds/voice/default/va/demohurtfloor5.ogg
 
 voice/legacy/death1      	sounds/voice/legacy/demodeath1.ogg
 voice/legacy/death2      	sounds/voice/legacy/demodeath2.ogg

zscript/items/swwm_powerups.zsc

@@ -87,6 +87,8 @@ Class GrilledCheeseSandwich : Inventory
 		if ( pickup && !deathmatch ) return false;
 		if ( Owner.Health > 500 ) return false;
 		if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA,CHANF_OVERLAP);
+		if ( (Owner.player == players[consoleplayer]) && (swwm_mutevoice < 2) )
+			SWWMHandler.AddOneliner("eat",2);
 		DoTheThing();
 		return true;
 	}

zscript/swwm_gesture_fx.zsc

@@ -579,7 +579,8 @@ Class HeadpatTracker : Actor
 			Demolitionist(patter).scriptedinvul = true;
 			target.bDORMANT = true;
 			if ( SWWMUtility.IdentifyingDog(target) ) SWWMUtility.MarkAchievement("mbf",user.player);
-			if ( SWWMHDoomHandler.IsCuteGirl(target) || SWWMHDoomHandler.IsStaticSexyTime(target) ) SWWMHandler.AddOneliner("pethdoom",2,40);
+			else if ( SWWMUtility.IdentifyingCaco(target) ) SWWMHandler.AddOneliner("petcaco",2,20);
+			else if ( SWWMHDoomHandler.IsCuteGirl(target) || SWWMHDoomHandler.IsStaticSexyTime(target) ) SWWMHandler.AddOneliner("pethdoom",2,40);
 			else if ( SWWMHDoomHandler.IsSexyTime(target) ) SWWMHandler.AddOneliner("pethdoomfinish",2,80);
 			return true;
 		}

zscript/swwm_player.zsc

@@ -2729,7 +2729,14 @@ Class Demolitionist : PlayerPawn
 			Console.Printf(StringTable.Localize("$SWWM_FINDKEY"),player.GetUserName(),item.GetTag(),score);
 			SWWMCredits.Give(player,score);
 			SWWMScoreObj.Spawn(100,player.mo.Vec3Offset(0,0,Height/2));
-			SWWMHandler.AddOneliner("keyget",2);
+			if ( !Random[DemoLines](0,5) &&
+				((item.GetClass() == 'RedSkull') || (item.GetClass() == 'YellowSkull')
+				|| (item.GetClass() == 'BlueSkull') || (item.GetClassName() == "PurpleSkull")) )
+			{
+				if ( !SWWMHandler.AddOneliner("skullget",2) )
+					SWWMHandler.AddOneliner("keyget",2);
+			}
+			else SWWMHandler.AddOneliner("keyget",2);
 			// share all keys in mp
 			for ( int i=0; i<MAXPLAYERS; i++ )
 			{
@@ -2751,6 +2758,12 @@ Class Demolitionist : PlayerPawn
 			if ( (mystats.ownedcollectibles.Size() > 0) && (mystats.ownedcollectibles.Find(cls) < mystats.ownedcollectibles.Size()) ) return;
 			mystats.ownedcollectibles.Push(cls);
 		}
+		// yorick
+		if ( item is 'PuzzSkull' && mystats && !mystats.gotyorick )
+		{
+			mystats.gotyorick = true;
+			SWWMHandler.AddOneliner("skullget",2);
+		}
 	}
 	override bool UseInventory( Inventory item )
 	{

zscript/swwm_thinkers_player.zsc

@@ -136,6 +136,7 @@ Class SWWMStats : Thinker
 	// easter eggs
 	int silveregg;
 	bool oldcheat;
+	bool gotyorick;
 
 	bool GotWeapon( Class<Weapon> which )
 	{