Merge pull request #180 from ReoDaProtovali/Chomp-Emotes

teppi emotes on the emotes branch because I added stuff when I said I wouldnt.

GainStation13/code/modules/mob/living/emote_modular.dm

@@ -1,54 +1,4 @@
 // This is a file for emotes that have been rewritten to be more modular. Such as varying based on species or whathave you. May move this later or something.
 
 
-//Taken from modular_citadel/code/modules/mob/cit_emotes.dm 
-/datum/emote/living/scream/run_emote(mob/living/user, params) //I can't not port this shit, come on.
-	if(user.nextsoundemote >= world.time || user.stat != CONSCIOUS)
-		return
-	var/sound
-	var/miming = user.mind ? user.mind.miming : 0
-	if(!user.is_muzzled() && !miming)
-		user.nextsoundemote = world.time + 7
-		if(issilicon(user))
-			sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
-			if(iscyborg(user))
-				var/mob/living/silicon/robot/S = user
-				if(S.cell.charge < 20)
-					to_chat(S, "<span class='warning'>Scream module deactivated. Please recharge.</span>")
-					return
-				S.cell.use(200)
-		if(ismonkey(user))
-			sound = 'modular_citadel/sound/voice/scream_monkey.ogg'
-		if(istype(user, /mob/living/simple_animal/hostile/gorilla))
-			sound = 'sound/creatures/gorilla.ogg'
-		if(ishuman(user))
-			user.adjustOxyLoss(5)
-			switch(H.dna.species)
-				if(/datum/species/human)
-					sound = pick()
-					if(prob(1))
-						sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
-					if(user.gender == FEMALE)
-						sound = pick('modular_citadel/sound/voice/scream_f1.ogg', 'modular_citadel/sound/voice/scream_f2.ogg')
-			
-			
-			if(is_species(user, /datum/species/android) || is_species(user, /datum/species/synth) || is_species(user, /datum/species/ipc) || is_species(user, /datum/species/synthliz))
-				sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
-			if(is_species(user, /datum/species/lizard))
-				sound = 'modular_citadel/sound/voice/scream_lizard.ogg'
-			if(is_species(user, /datum/species/skeleton))
-				sound = 'modular_citadel/sound/voice/scream_skeleton.ogg'
-			if (is_species(user, /datum/species/fly) || is_species(user, /datum/species/insect))
-				sound = 'modular_citadel/sound/voice/scream_moth.ogg'
-		if(isalien(user))
-			sound = 'sound/voice/hiss6.ogg'
-		LAZYINITLIST(user.alternate_screams)
-		if(LAZYLEN(user.alternate_screams))
-			sound = pick(user.alternate_screams)
-		playsound(user.loc, sound, 50, 1, 4, 1.2)
-		message = "screams!"
-	else if(miming)
-		message = "acts out a scream."
-	else
-		message = "makes a very loud noise."
-	. = ..()
+//I was going to put screams in here but I overhauled it in a different more austistic way

GainStation13/code/modules/mob/living/emote_ported.dm

@@ -135,12 +135,12 @@
 
 //Ported from Vorestation
 /datum/emote/living/carbon/teshsqueak
-	key = "teshsqueak" //Originally, It was just "surprised" but I dont think that's very telling of a teshari emote.
-	key_third_person = "teshsqueaks"
+	key = "teshsurprise" //Originally, It was just "surprised" but I dont think that's very telling of a teshari emote.
+	key_third_person = "teshsurprised"
 	message = "chirps in surprise!"
 	message_param = "chirps in surprise at %t!"
 	emote_type = EMOTE_AUDIBLE
-	sound = 'GainStation13/sound/voice/teshari/teshsqueak.ogg'
+	sound = 'GainStation13/sound/voice/teshari/teshsqueak.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
 
 /datum/emote/living/carbon/teshchirp
 	key = "tchirp"
@@ -148,7 +148,7 @@
 	message = "chirps!"
 	message_param = "chirps at %t!"
 	emote_type = EMOTE_AUDIBLE
-	sound = 'GainStation13/sound/voice/teshari/teshchirp.ogg'
+	sound = 'GainStation13/sound/voice/teshari/teshchirp.ogg' // Copyright Sampling+ 1.0 Incarnidine (freesound.org) for the source audio.
 
 /datum/emote/living/carbon/teshtrill
 	key = "trill"
@@ -156,7 +156,7 @@
 	message = "trills."
 	message_param = "trills at %t."
 	emote_type = EMOTE_AUDIBLE
-	sound = 'GainStation13/sound/voice/teshari/teshtrill.ogg'
+	sound = 'GainStation13/sound/voice/teshari/teshtrill.ogg' // Copyright CC BY-NC 3.0 Arnaud Coutancier (freesound.org) for the source audio.
 
 /datum/emote/living/sneeze/teshsneeze //Replace this with a modular species/tongue based sneeze system later. Also piggybacking on normal sneezes
 	key = "teshsneeze"
@@ -184,6 +184,47 @@ return pick('GainStation13/sound/voice/teshari/teshsneeze.ogg', 'GainStation13/s
 	emote_type = EMOTE_AUDIBLE
 	sound = 'GainStation13/sound/voice/teshari/teshscream.ogg'
 
+/datum/emote/living/teppi
+	key = "gyoh"
+	key_third_person = "gyohs"
+	message = "gyohs"
+	var/bigsound = list('GainStation13/sound/voice/teppi/gyooh1.ogg', 'GainStation13/sound/voice/teppi/gyooh2.ogg', \
+						'GainStation13/sound/voice/teppi/gyooh3.ogg', 'GainStation13/sound/voice/teppi/gyooh4.ogg', \
+						'GainStation13/sound/voice/teppi/gyooh5.ogg', 'GainStation13/sound/voice/teppi/gyooh6.ogg')
+	var/smolsound = list('GainStation13/sound/voice/teppi/whine1.ogg', 'GainStation13/sound/voice/teppi/whine2.ogg')
+
+/datum/emote/living/teppi/run_emote(mob/living/user, params)
+	/* //If we port teppi later, Enable this.
+	if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi))
+		if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi/baby))
+			sound = pick(smolsound)
+		else
+			sound = pick(bigsound)
+		return ..()
+	*/
+	if(user.size_multipler >= 1.5)
+		sound = pick(bigsound)
+	else
+		sound = pick(smolsound)
+	. = ..()
+
+/datum/emote/living/teppi/rumble
+	key = "rumble"
+	key_third_person = "rumbles"
+	message = "rumbles contentedly."
+	sound = 'GainStation13/sound/voice/teppi/cute_rumble.ogg'
+	var/bigsound = list('GainStation13/sound/voice/teppi/rumble.ogg')
+	var/smolsound = list('GainStation13/sound/voice/teppi/cute_rumble.ogg')
+
 //Vorestation ports end.
 
+//Ported from Chompstation
+/datum/emote/living/wawa
+	key = "wawa"
+	key_third_person = "wawas"
+	message = "wawas."
+	message_param = "wawas at %t."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'GainStation13/sound/voice/emotes/wawa.ogg'
 
+//Chompstation ports end.

code/modules/mob/living/carbon/human/species_types/flypeople.dm

@@ -12,6 +12,8 @@
 	liked_food = GROSS
 	exotic_bloodtype = "BUG"
 
+	screamsound = 'modular_citadel/sound/voice/scream_moth.ogg'
+
 /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
 	if(chem.type == /datum/reagent/toxin/pestkiller)
 		H.adjustToxLoss(3)

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -24,7 +24,7 @@
 	else
 		message = "muffles something."
 	. = ..()
-/*
+
 /datum/emote/living/scream/run_emote(mob/living/user, params) //I can't not port this shit, come on.
 	if(user.nextsoundemote >= world.time || user.stat != CONSCIOUS)
 		return
@@ -44,6 +44,7 @@
 			sound = 'modular_citadel/sound/voice/scream_monkey.ogg'
 		if(istype(user, /mob/living/simple_animal/hostile/gorilla))
 			sound = 'sound/creatures/gorilla.ogg'
+		/* //Gainstation Remove: Human species scream overhaul oops
 		if(ishuman(user))
 			user.adjustOxyLoss(5)
 			sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
@@ -57,6 +58,7 @@
 				sound = 'modular_citadel/sound/voice/scream_skeleton.ogg'
 			if (is_species(user, /datum/species/fly) || is_species(user, /datum/species/insect))
 				sound = 'modular_citadel/sound/voice/scream_moth.ogg'
+			*/
 		if(isalien(user))
 			sound = 'sound/voice/hiss6.ogg'
 		LAZYINITLIST(user.alternate_screams)
@@ -69,7 +71,7 @@
 	else
 		message = "makes a very loud noise."
 	. = ..()
-*/
+
 /datum/emote/carbon/snap
 	key = "snap"
 	key_third_person = "snaps"

modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm

@@ -17,7 +17,7 @@
 	var/list/female_screams = list('sound/voice/human/femalescream_1.ogg', 'sound/voice/human/femalescream_2.ogg', 'sound/voice/human/femalescream_3.ogg', 'sound/voice/human/femalescream_4.ogg', 'sound/voice/human/femalescream_5.ogg')
 	var/list/male_screams = list('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg')
 
-	/datum/species/human/get_scream_sound(mob/living/carbon/human/H)
+/datum/species/human/get_scream_sound(mob/living/carbon/human/H)
 	if(H.gender == FEMALE)
 		return pick(female_screams)
 	else

tgstation.dme

@@ -3107,6 +3107,8 @@
 #include "GainStation13\code\modules\food_and_drinks\objects\candy_flora.dm"
 #include "GainStation13\code\modules\food_and_drinks\recipes\recipes_ported.dm"
 #include "GainStation13\code\modules\mob\living\emote.dm"
+#include "GainStation13\code\modules\mob\living\emote_modular.dm"
+#include "GainStation13\code\modules\mob\living\emote_ported.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\dwarverndrinks.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\fatty_drinks.dm"