Merge branch 'evilew:master' into belchfix

code/_globalvars/lists/flavor_misc.dm

@@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
 
 //LANGUAGE CHARACTER CUSTOMIZATION
 GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks","mumbles","crackles"))
-GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien/hybrid))
+GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien/hybrid, "kitty tongue" = /obj/item/organ/tongue/kitty)) //GS13 - added kitty tongue to list of roundstart tongues
 
 /proc/get_roundstart_languages()
 	var/list/languages = subtypesof(/datum/language)

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

@@ -643,6 +643,7 @@
 	remove_all_embedded_objects()
 	set_heartattack(FALSE)
 	drunkenness = 0
+	burpslurring = 0 //GS13 edit
 	for(var/datum/mutation/human/HM in dna.mutations)
 		if(HM.quality != POSITIVE)
 			dna.remove_mutation(HM.name)

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

@@ -8,6 +8,7 @@
 
 	mutantears = /obj/item/organ/ears/cat
 	mutanttail = /obj/item/organ/tail/cat
+	mutanttongue = /obj/item/organ/tongue/kitty //GS13 - felinids start with kitty tongue
 
 	tail_type = "mam_tail"
 	wagging_type = "mam_waggingtail"

code/modules/mob/living/life.dm

@@ -163,6 +163,11 @@
 	if(slurring)
 		slurring = max(slurring-1,0)
 
+	// GS13 edit
+	if(burpslurring)
+		burpslurring = max(burpslurring-1,0)
+	//end of gs13 edit
+
 	if(cultslurring)
 		cultslurring = max(cultslurring-1, 0)
 

code/modules/mob/living/say.dm

@@ -433,6 +433,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 
 	if(slurring)
 		message = slur(message,slurring)
+	//GS13 edit
+	if(burpslurring)
+		message = burpslur(message,burpslurring)
+	//end of GS13 edit
 
 	if(cultslurring)
 		message = cultslur(message)