Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/mob/living/carbon/human/alien/alien_facehugger.dm

@@ -115,6 +115,7 @@ var/const/MAX_ACTIVE_TIME = 400
 	if(istype(C) && locate(/datum/organ/internal/xenos/hivenode) in C.internal_organs)
 		return
 
+
 	attached++
 	spawn(MAX_IMPREGNATION_TIME)
 		attached = 0
@@ -146,6 +147,7 @@ var/const/MAX_ACTIVE_TIME = 400
 			target.visible_message("\red \b [src] tears [W] off of [target]'s face!")
 
 		target.equip_to_slot(src, slot_wear_mask)
+		target.contents += src // Monkey sanity check - Snapshot
 
 		if(!sterile) L.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
 	else if (iscorgi(M))

code/modules/mob/living/carbon/human/alien/alien_species.dm

@@ -37,6 +37,9 @@
 	death_message = "lets out a waning guttural screech, green blood bubbling from its maw."
 	death_sound = 'sound/voice/hiss6.ogg'
 
+	speech_sounds = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
+	speech_chance = 100
+
 	breath_type = null
 	poison_type = null
 

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

@@ -141,7 +141,7 @@
 /mob/living/carbon/human/getCloneLoss()
 	if(species.flags & (IS_SYNTHETIC | NO_SCAN))
 		cloneloss = 0
-	..()
+	return ..()
 
 /mob/living/carbon/human/setCloneLoss(var/amount)
 	if(species.flags & (IS_SYNTHETIC | NO_SCAN))
@@ -188,7 +188,7 @@
 /mob/living/carbon/human/getOxyLoss()
 	if(species.flags & NO_BREATHE)
 		oxyloss = 0
-	..()
+	return ..()
 
 /mob/living/carbon/human/adjustOxyLoss(var/amount)
 	if(species.flags & NO_BREATHE)
@@ -205,7 +205,7 @@
 /mob/living/carbon/human/getToxLoss()
 	if(species.flags & NO_POISON)
 		toxloss = 0
-	..()
+	return ..()
 
 /mob/living/carbon/human/adjustToxLoss(var/amount)
 	if(species.flags & NO_POISON)

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

@@ -126,7 +126,7 @@
 
 	var/sound/speech_sound
 	var/sound_vol
-	if(species.speech_sounds && prob(20))
+	if(species.speech_sounds && prob(species.speech_chance))
 		speech_sound = sound(pick(species.speech_sounds))
 		sound_vol = 50
 
@@ -154,9 +154,7 @@
 
 				if(findtext(temp, "*", 1, 2))	//emotes
 					return
-				world << "Text after stuff is [temp]"
 				temp = copytext(trim_left(temp), 1, rand(5,8))
-				world << "Text after trimming is [temp]"
 
 				var/trimmed = trim_left(temp)
 				if(length(trimmed))

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

@@ -30,6 +30,7 @@
 	var/secondary_langs = list()  // The names of secondary languages that are available to this species.
 	var/mutantrace                // Safeguard due to old code.
 	var/list/speech_sounds        // A list of sounds to potentially play when speaking.
+	var/list/speech_chance
 	var/has_fine_manipulation = 1 // Can use small items.
 	var/insulated                 // Immune to electrocution and glass shards to the feet.
 
@@ -293,6 +294,7 @@
 	rarity_value = 2
 
 	speech_sounds = list('sound/voice/shriek1.ogg')
+	speech_chance = 20
 
 	warning_low_pressure = 50
 	hazard_low_pressure = 0