Merge pull request #7043 from MisterLayne/prommie-lang

Promethean Language

code/__defines/species_languages.dm

@@ -53,13 +53,14 @@
 #define LANGUAGE_AKHANI "Akhani"
 #define LANGUAGE_ALAI "Alai"
 #define LANGUAGE_ZADDAT "Vedahq"
+#define LANGUAGE_PROMETHEAN "Promethean"
 #define LANGUAGE_BLOB "Blob"
 #define LANGUAGE_GIBBERISH "Babel"
 
 // Language flags.
 #define WHITELISTED  1   // Language is available if the speaker is whitelisted.
 #define RESTRICTED   2   // Language can only be acquired by spawning or an admin.
-#define NONVERBAL    4   // Language has a significant non-verbal component. Speech is garbled without line-of-sight.
+#define NONVERBAL    4   // Language uses both verbal and non-verbal components completely to communicate. Out-of-sight speech is garbled.
 #define SIGNLANG     8   // Language is completely non-verbal. Speech is displayed through emotes for those who can understand.
 #define HIVEMIND     16  // Broadcast to all mobs with this language.
 #define NONGLOBAL    32  // Do not add to general languages list.

code/modules/mob/language/station.dm

@@ -92,7 +92,7 @@
 	signlang_verb = list("gestures with their hands", "gestures with their ears and tail", "gestures with their ears, tail and hands")
 	colour = "tajaran"
 	key = "l"
-	flags = WHITELISTED | SIGNLANG | NO_STUTTER | NONVERBAL
+	flags = WHITELISTED | SIGNLANG | NO_STUTTER //nonverbal define was not needed here, and i need to use it ~Layne
 
 /datum/language/tajsign/broadcast(var/mob/living/speaker, var/message, var/speaker_mask)
 	log_say("(SIGN) [message]", speaker)
@@ -219,6 +219,19 @@
 	space_chance = 20
 	syllables = list("z", "dz", "i", "iv", "ti", "az", "hix", "xo", "av", "xo", "x", "za", "at", "vi")
 
+/datum/language/promethean
+	name = LANGUAGE_PROMETHEAN
+	desc = "A complex language composed of guttural noises and bioluminescent signals"
+	signlang_verb = list("flickers","flashes","rapidly flashes a light","quickly flickers a light")
+	speech_verb = "gurgles"
+	ask_verb = "gurgles"
+	exclaim_verb = "gurgles"
+	colour = "promethean"
+	key = "t"
+	flags = WHITELISTED | NONVERBAL
+	space_chance = 20
+	syllables = list("gur","gul","gug","gel","ger","geg","gir","gil","gig","gor","gol","gog","ug","ul","ur","uu","el","eg","er","oe","ig","il","ir","oi","og","ol","or","oo")
+
 
 //Syllable Lists
 /*

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

@@ -30,8 +30,8 @@ var/datum/species/shapeshifter/promethean/prometheans
 	spawn_flags		 = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
 	health_hud_intensity = 2
 	num_alternate_languages = 3
-	species_language = LANGUAGE_SOL_COMMON
-	secondary_langs = list(LANGUAGE_SOL_COMMON)	// For some reason, having this as their species language does not allow it to be chosen.
+	species_language = LANGUAGE_PROMETHEAN
+	secondary_langs = list(LANGUAGE_PROMETHEAN, LANGUAGE_SOL_COMMON)	// For some reason, having this as their species language does not allow it to be chosen.
 	assisted_langs = list(LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)	// Prometheans are weird, let's just assume they can use basically any language.
 
 	breath_type = null

code/modules/mob/living/say.dm

@@ -286,8 +286,7 @@ proc/get_radio_key_from_channel(var/channel)
 	//Handle nonverbal languages here
 	for(var/datum/multilingual_say_piece/S in message_pieces)
 		if(S.speaking.flags & NONVERBAL)
-			if(prob(30))
-				custom_emote(1, "[pick(S.speaking.signlang_verb)].")
+			custom_emote(1, "[pick(S.speaking.signlang_verb)].")
 
 	//These will contain the main receivers of the message
 	var/list/listening = list()

code/modules/vchat/css/ss13styles.css

@@ -162,8 +162,10 @@ h1.alert, h2.alert		{color: #000000;}
 .vulpkanin				{color: #B97A57;}
 .enochian				{color: #848A33; letter-spacing:-1pt; word-spacing:4pt; font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;}
 .daemon					{color: #5E339E; letter-spacing:-1pt; word-spacing:0pt; font-family: "Courier New", Courier, monospace;}
-.bug                                    {color: #9e9e39;}
+.bug					{color: #9e9e39;}
 .vox					{color: #AA00AA;}
+.promethean				{color: #5A5A5A; font-family:"Comic Sans MS","Comic Sans",cursive;}
+.inverted .promethean	{color: #A5A5A5; font-family:"Comic Sans MS","Comic Sans",cursive;}
 .zaddat					{color: #941C1C;}
 .rough					{font-family: "Trebuchet MS", cursive, sans-serif;}
 .say_quote				{font-family: Georgia, Verdana, sans-serif;}

code/stylesheet.dm

@@ -106,6 +106,7 @@ h1.alert, h2.alert		{color: #000000;}
 .bug                                    {color: #9e9e39;}
 .vox					{color: #AA00AA;}
 .zaddat					{color: #941C1C;}
+.promethean				{color: #5A5A5A;}
 .rough					{font-family: "Trebuchet MS", cursive, sans-serif;}
 .say_quote				{font-family: Georgia, Verdana, sans-serif;}
 .terminus				{font-family: "Times New Roman", Times, serif, sans-serif}

html/changelogs/Layne - Promethean Language.yml

@@ -0,0 +1,5 @@
+author: Layne
+delete-after: True
+changes: 
+  - rscadd: "Promethean language."
+  - tweak: "NONVERBAL define was changed a bit."