From 2d784b3b598f37da3d9caa2b29dc56a163de8b0d Mon Sep 17 00:00:00 2001 From: fludd12 Date: Mon, 30 Jan 2017 21:40:34 -0500 Subject: [PATCH 1/3] Fixes the weird files finally --- code/modules/client/preference/preferences.dm | 7 +++++++ code/modules/mob/living/carbon/human/human_defines.dm | 1 + code/modules/mob/living/carbon/human/say.dm | 5 ++++- goon/browserassets/css/browserOutput.css | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index a558bad3dec..3f86110346d 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -282,6 +282,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "Species: [species]
" if(species == "Vox") dat += "N2 Tank: [speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"]
" + if(species == "Grey") + dat += "Voice: [speciesprefs ? "Wingdings" : "Normal"]
" dat += "Secondary Language: [language]
" dat += "Blood Type: [b_type]
" if(species in list("Human", "Drask", "Vox")) @@ -1331,6 +1333,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 @@ -2035,6 +2038,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.add_language(language) + if(species == "Grey") + if(speciesprefs) + character.speech_span = "wingdings" + 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/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 0d30c5c8265..1216c3bda1b 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -43,6 +43,7 @@ var/global/default_martial_art = new/datum/martial_art var/icon/lying_icon = null var/voice = "" //Instead of new say code calling GetVoice() over and over and over, we're just going to ask this variable, which gets updated in Life() + var/speech_span var/speech_problem_flag = 0 diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 26ca4af83e8..f066a2e6b9d 100644 --- 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 = 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 = "[message]" + span = "sans" + if(span) + message = "[message]" returns[1] = message returns[2] = verb returns[3] = speech_problem_flag diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index c7204d36577..71ec2b97028 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -299,6 +299,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;} From fe9f547da65cd441d5bec0db4c3f0071798c4dc0 Mon Sep 17 00:00:00 2001 From: fludd12 Date: Fri, 3 Feb 2017 22:05:16 -0500 Subject: [PATCH 2/3] Moves spans to mind --- code/datums/mind.dm | 3 ++- code/modules/client/preference/preferences.dm | 8 +++++--- code/modules/mob/living/carbon/human/human_defines.dm | 1 - code/modules/mob/living/carbon/human/say.dm | 2 +- code/modules/mob/new_player/new_player.dm | 1 + 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index fcf1ded97cc..619bc5c6045 100644 --- 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/datum/vampire/vampire //vampire holder @@ -1324,7 +1325,7 @@ var/explanation = "Summon [ticker.mode.cultdat.entity_name] via the use of the appropriate rune. It will only work if nine cultists stand on and around it." to_chat(current, "Objective #1: [explanation]") current.memory += "Objective #1: [explanation]
" - + var/mob/living/carbon/human/H = current if(istype(H)) diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 3f86110346d..20cdd45d20a 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -2022,6 +2022,11 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts ShowChoices(user) return 1 +/datum/preferences/proc/copy_to_mind(datum/mind/M) + if(species == "Grey") + if(speciesprefs) + M.speech_span = "wingdings" + /datum/preferences/proc/copy_to(mob/living/carbon/human/character) var/datum/species/S = all_species[species] character.change_species(species) // Yell at me if this causes everything to melt @@ -2038,9 +2043,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.add_language(language) - if(species == "Grey") - if(speciesprefs) - character.speech_span = "wingdings" character.real_name = real_name character.dna.real_name = real_name diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 1216c3bda1b..0d30c5c8265 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -43,7 +43,6 @@ var/global/default_martial_art = new/datum/martial_art var/icon/lying_icon = null var/voice = "" //Instead of new say code calling GetVoice() over and over and over, we're just going to ask this variable, which gets updated in Life() - var/speech_span var/speech_problem_flag = 0 diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index f066a2e6b9d..cac5ec6952c 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -105,7 +105,7 @@ /mob/living/carbon/human/handle_speech_problems(var/message, var/verb) var/list/returns[3] var/speech_problem_flag = 0 - var/span = speech_span + var/span = mind.speech_span if(silent || (disabilities & MUTE)) message = "" diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index bccd7990de9..d18bad69475 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -506,6 +506,7 @@ new_character.real_name = pick(diona_names) //I hate this being here of all places but unfortunately dna is based on real_name! new_character.rename_self("diona") mind.original = new_character + client.prefs.copy_to_mind(mind) mind.transfer_to(new_character) //won't transfer key since the mind is not active From 18b806df862426f1e53f850072eda2e099fd509c Mon Sep 17 00:00:00 2001 From: fludd12 Date: Fri, 3 Feb 2017 22:36:06 -0500 Subject: [PATCH 3/3] Don't blame me this was Krausus' idea --- code/modules/client/preference/preferences.dm | 5 ----- code/modules/mob/living/carbon/human/species/station.dm | 5 +++++ code/modules/mob/new_player/new_player.dm | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 20cdd45d20a..c0f97c074f8 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -2022,11 +2022,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts ShowChoices(user) return 1 -/datum/preferences/proc/copy_to_mind(datum/mind/M) - if(species == "Grey") - if(speciesprefs) - M.speech_span = "wingdings" - /datum/preferences/proc/copy_to(mob/living/carbon/human/character) var/datum/species/S = all_species[species] character.change_species(species) // Yell at me if this causes everything to melt diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 5bde6ce8e5b..1c55b10a921 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -722,6 +722,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/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d18bad69475..bccd7990de9 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -506,7 +506,6 @@ new_character.real_name = pick(diona_names) //I hate this being here of all places but unfortunately dna is based on real_name! new_character.rename_self("diona") mind.original = new_character - client.prefs.copy_to_mind(mind) mind.transfer_to(new_character) //won't transfer key since the mind is not active