Merge pull request ParadiseSS13#6280 from fludd12/Grey-Wingdings

Wingdings Revival^2
thingpony · Feb 13, 2017 · 3007513 · 3007513
2 parents b3c9912 + 18b806d
commit 3007513
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
@@ -54,6 +54,7 @@
 	var/has_been_rev = 0//Tracks if this mind has been a rev or not
 
 	var/miming = 0 // Mime's vow of silence
+	var/speech_span // What span any body this mind has talks in.
 	var/datum/faction/faction 			//associated faction
 	var/datum/changeling/changeling		//changeling holder
 	var/linglink

diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
@@ -283,6 +283,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			dat += "<b>Species:</b> <a href='?_src_=prefs;preference=species;task=input'>[species]</a><br>"
 			if(species == "Vox")
 				dat += "<b>N2 Tank:</b> <a href='?_src_=prefs;preference=speciesprefs;task=input'>[speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"]</a><br>"
+			if(species == "Grey")
+				dat += "<b>Voice:</b> <a href ='?_src_=prefs;preference=speciesprefs;task=input'>[speciesprefs ? "Wingdings" : "Normal"]</a><BR>"
 			dat += "<b>Secondary Language:</b> <a href='?_src_=prefs;preference=language;task=input'>[language]</a><br>"
 			dat += "<b>Blood Type:</b> <a href='?_src_=prefs;preference=b_type;task=input'>[b_type]</a><br>"
 			if(species in list("Human", "Drask", "Vox"))
@@ -1334,6 +1336,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 							b_skin = 0
 
 						alt_head = "None" //No alt heads on species that don't have them.
+						speciesprefs = 0 //My Vox tank shouldn't change how my future Grey talks.
 
 						body_accessory = null //no vulptail on humans damnit
 
@@ -2040,6 +2043,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 	character.add_language(language)
 
+
 	character.real_name = real_name
 	character.dna.real_name = real_name
 	character.name = character.real_name

diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
@@ -105,6 +105,7 @@
 /mob/living/carbon/human/handle_speech_problems(var/message, var/verb)
 	var/list/returns[3]
 	var/speech_problem_flag = 0
+	var/span = mind.speech_span
 
 	if(silent || (disabilities & MUTE))
 		message = ""
@@ -143,8 +144,10 @@
 				verb = "yells loudly"
 
 	if((COMIC in mutations) || (locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs))
-		message = "<span class='sans'>[message]</span>"
+		span = "sans"
 
+	if(span)
+		message = "<span class='[span]'>[message]</span>"
 	returns[1] = message
 	returns[2] = verb
 	returns[3] = speech_problem_flag

diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
@@ -720,6 +720,11 @@
 		genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
 	..()
 
+/datum/species/grey/equip(var/mob/living/carbon/human/H)
+	var/speech_pref = H.client.prefs.speciesprefs
+	if(speech_pref)
+		H.mind.speech_span = "wingdings"
+
 /datum/species/diona
 	name = "Diona"
 	name_plural = "Dionaea"

diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css
@@ -300,6 +300,7 @@ h1.alert, h2.alert			{color: #000000;}
 .confirm				{color: #00af3b;}
 .rose					{color: #ff5050;}
 .sans					{font-family: 'Comic Sans MS', cursive, sans-serif;}
+.wingdings				{font-family: Wingdings, Webdings;}
 .ancient				{color: #008B8B;	font-stye: italic;}
 .newscaster				{color: #800000;}
 .mod					{color: #735638;	font-weight: bold;}