From 130b8f103c7a2390a445c2a6bca87c712d839b85 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 31 Jan 2021 14:05:28 -0500 Subject: [PATCH 01/26] Create signlanguage.dm --- code/modules/language/signlanguage.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 code/modules/language/signlanguage.dm diff --git a/code/modules/language/signlanguage.dm b/code/modules/language/signlanguage.dm new file mode 100644 index 0000000000..9ed789de81 --- /dev/null +++ b/code/modules/language/signlanguage.dm @@ -0,0 +1,11 @@ +/datum/language/signlanguage + name = "Space Sign Language" + desc = "Those who cannot speak can learn this instead." + speech_verb = "signs" + whisper_verb = "gestures" + key = "9" + flags = TONGUELESS_SPEECH + + syllables = list(".") + + default_priority = 90 From a654f27ce0624e6dad9a992ba627648602c9de3d Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 31 Jan 2021 14:14:12 -0500 Subject: [PATCH 02/26] Update signlanguage.dm --- code/modules/language/signlanguage.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/language/signlanguage.dm b/code/modules/language/signlanguage.dm index 9ed789de81..97705d4a4c 100644 --- a/code/modules/language/signlanguage.dm +++ b/code/modules/language/signlanguage.dm @@ -8,4 +8,5 @@ syllables = list(".") + icon_state = "ssl" default_priority = 90 From 318f34be786e28ee66d29799f93ae5dc9f931500 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 31 Jan 2021 14:15:40 -0500 Subject: [PATCH 03/26] Update headset.dm --- code/game/objects/items/devices/radio/headset.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 939d77a1f0..015b8774ad 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -69,7 +69,8 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/talk_into(mob/living/M, message, channel, list/spans,datum/language/language) if (!listening) return ITALICS | REDUCE_RANGE - return ..() + if (language != /datum/language/signlanguage) + return ..() /obj/item/radio/headset/can_receive(freq, level, AIuser) if(ishuman(src.loc)) From cfa169293c050002914c54e667d68e888cdc3f19 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 31 Jan 2021 14:17:53 -0500 Subject: [PATCH 04/26] Update radio.dm --- code/game/objects/items/devices/radio/radio.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 4623a405de..b1506bfbd0 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -208,6 +208,8 @@ return if(!M.IsVocal()) return + if(language != /datum/language/signlanguage) + return if(use_command) spans |= commandspan From 4f5f0eec076a4ac3cd75a55143e496e8468d46d9 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 31 Jan 2021 14:19:04 -0500 Subject: [PATCH 05/26] Update radio.dm --- code/game/objects/items/devices/radio/radio.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index b1506bfbd0..3435a0d0f0 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -208,7 +208,7 @@ return if(!M.IsVocal()) return - if(language != /datum/language/signlanguage) + if(language == /datum/language/signlanguage) return if(use_command) From 9acdad29c5ebb35695010e0c9076030c5fd5a178 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 31 Jan 2021 14:33:33 -0500 Subject: [PATCH 06/26] Update say.dm --- code/modules/mob/living/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 4c03e74d70..606daed0c5 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -329,7 +329,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return 1 /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels - if(HAS_TRAIT(src, TRAIT_MUTE)) + if(HAS_TRAIT(src, TRAIT_MUTE) && get_message_language(message) != /datum/language/signlanguage) return 0 if(is_muzzled()) From fdf575e618de44a31177dd7e08deab2bbfa179a7 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Sun, 31 Jan 2021 15:16:55 -0500 Subject: [PATCH 07/26] Update tgstation.dme --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 5ea3b652e7..ee8b47c91f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2336,6 +2336,7 @@ #include "code\modules\language\mushroom.dm" #include "code\modules\language\narsian.dm" #include "code\modules\language\ratvarian.dm" +#include "code\modules\language\signlanguage.dm" #include "code\modules\language\slime.dm" #include "code\modules\language\swarmer.dm" #include "code\modules\language\sylvan.dm" From 9bda74c58dfc21e9c510e53f5be8d7e637406852 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:34:45 -0500 Subject: [PATCH 08/26] Update good.dm --- code/datums/traits/good.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 23fd75f982..4a4108f005 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -219,3 +219,19 @@ /datum/quirk/night_vision/on_spawn() var/mob/living/carbon/human/H = quirk_holder H.update_sight() + +/datum/quirk/multilingual + name = "Multi-Lingual" + desc = "You spent a portion of your life learning to understand an additional language. You may or may not be able to speak it based on your anatomy." + value = 1 + mob_trait = TRAIT_MULTILINGUAL + gain_text = "You've learned an extra language!" + lose_text = "You've forgotten your extra language." + +/datum/quirk/multilingual/add() + var/mob/living/carbon/human/H = quirk_holder + H.grant_language(H.client.prefs.language, TRUE, TRUE, LANGUAGE_MIND) + +/datum/quirk/multilingual/remove() + var/mob/living/carbon/human/H = quirk_holder + H.remove_language(H.client.prefs.language, TRUE, TRUE, LANGUAGE_MIND) From 992b7909ba1e5e4512bcbc0ae2af641e78501d36 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:35:49 -0500 Subject: [PATCH 09/26] Update traits.dm --- code/__DEFINES/traits.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index b7750556d5..3d041edfd2 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -197,6 +197,7 @@ #define TRAIT_EMPATH "empath" #define TRAIT_FRIENDLY "friendly" #define TRAIT_SNOB "snob" +#define TRAIT_MULTILINGUAL "multilingual" #define TRAIT_CULT_EYES "cult_eyes" #define TRAIT_AUTO_CATCH_ITEM "auto_catch_item" #define TRAIT_CLOWN_MENTALITY "clown_mentality" // The future is now, clownman. From 6ad09c3de120d7c99c4d9d8a186be3947cf01e74 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:42:42 -0500 Subject: [PATCH 10/26] Update preferences.dm --- code/modules/client/preferences.dm | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7cc8be800c..848d9e70c2 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -99,6 +99,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/be_random_body = 0 //whether we'll have a random body every round var/gender = MALE //gender of character (well duh) var/age = 30 //age of character + var/phobia = "Random" //phobia + var/language = "Random" //bonus language + var/choselanguage = "Random" //language appearance var/underwear = "Nude" //underwear type var/undie_color = "FFFFFF" var/undershirt = "Nude" //undershirt type @@ -308,6 +311,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]
" dat += "Age: [age]
" + dat += "Phobia: [chosephobia]
" + dat += "Language: [choselanguage]
" dat += "Special Names:
" var/old_group @@ -2315,6 +2320,45 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["body_model"] = chosengender gender = chosengender + if("phobia") + var/chosephobia = input(user, "Select a phobia.", "Phobia", phobia) as null|anything in list("spiders", "space", "security", "clowns", "greytide", "lizards", + "skeletons", "snakes", "robots", "doctors", "authority", "the supernatural", + "aliens", "strangers", "birds", "falling", "anime", "mimes", "cats", "syndicate", + "eye","Random") + if(!chosephobia) + return + phobia = chosephobia + + if("language") + choselanguage = input(user, "Select a language.", "Language", language) as null|anything in list("Beachtongue","Codespeak","Draconic","Dwarven", + "Chimpanzee", "Nar'Sian","Ratvarian","Space Sign Language","Blah-Sucker","Random") + if(!choselanguage) + return + switch(choselanguage) + if("Rachidian") + language = /datum/language/arachnid + if("Beachtongue") + language = /datum/language/beachbum + if("Codespeak") + language = /datum/language/codespeak + if("Draconic") + language = /datum/language/draconic + if("Dwarven") + language = /datum/language/dwarf + if("Chimpanzee") + language = /datum/language/monkey + if("Nar'sian") + language = /datum/language/narsie + if("Ratvarian") + language = /datum/language/ratvar + if("Space Sign Language") + language = /datum/language/signlanguage + if("Blah-Sucker") + language = /datum/language/vampiric + if("Random") + language = pick(list("Rachidian", "Beachtongue","Codespeak","Draconic","Dwarven", + "Chimpanzee", "Nar'Sian","Ratvarian","Space Sign Language","Blah-Sucker")) + if("body_size") var/new_body_size = input(user, "Choose your desired sprite size: (90-125%)\nWarning: This may make your character look distorted. Additionally, any size under 100% takes a 10% maximum health penalty", "Character Preference", features["body_size"]*100) as num|null if(new_body_size) From c8f797d69ca1176ba29b9e27985ed644cdb1c73a Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:45:14 -0500 Subject: [PATCH 11/26] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 0db9fbb66c..831c5040c2 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -604,6 +604,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["body_model"] >> features["body_model"] S["body_size"] >> features["body_size"] S["age"] >> age + S["phobia"] >> phobia + S["language"] >> language + S["choselanguage"] >> choselanguage S["hair_color"] >> hair_color S["facial_hair_color"] >> facial_hair_color S["eye_type"] >> eye_type @@ -947,6 +950,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["body_model"] , features["body_model"]) WRITE_FILE(S["body_size"] , features["body_size"]) WRITE_FILE(S["age"] , age) + WRITE_FILE(S["phobia"] , phobia) + WRITE_FILE(S["language"] , language) + WRITE_FILE(S["choselanguage"] , choselanguage) WRITE_FILE(S["hair_color"] , hair_color) WRITE_FILE(S["facial_hair_color"] , facial_hair_color) WRITE_FILE(S["eye_type"] , eye_type) From 678d0c950f4b200cf3b77034ffbb0f64b989c044 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:48:34 -0500 Subject: [PATCH 12/26] Update negative.dm --- code/datums/traits/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 3cbf4b3cd2..81edfcf55a 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -333,7 +333,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) /datum/quirk/phobia/post_add() var/mob/living/carbon/human/H = quirk_holder - phobia = new + phobia = new(H.client.prefs.phobia) H.gain_trauma(phobia, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/phobia/remove() From 6c49becd2eaf15d970ee46bb19bd3de1cc5f46e0 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:52:44 -0500 Subject: [PATCH 13/26] Update preferences.dm --- code/modules/client/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 848d9e70c2..a9cd2e6a4b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -311,7 +311,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]
" dat += "Age: [age]
" - dat += "Phobia: [chosephobia]
" + dat += "Phobia: [phobia]
" dat += "Language: [choselanguage]
" dat += "Special Names:
" From db548a4cfa469044c69b51b3de272a7955b67649 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 09:03:27 -0500 Subject: [PATCH 14/26] Removed antag languages --- code/modules/client/preferences.dm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index a9cd2e6a4b..4b0ee9677e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2330,8 +2330,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) phobia = chosephobia if("language") - choselanguage = input(user, "Select a language.", "Language", language) as null|anything in list("Beachtongue","Codespeak","Draconic","Dwarven", - "Chimpanzee", "Nar'Sian","Ratvarian","Space Sign Language","Blah-Sucker","Random") + choselanguage = input(user, "Select a language.", "Language", language) as null|anything in list("Beachtongue","Draconic","Dwarven", + "Chimpanzee","Space Sign Language","Random") if(!choselanguage) return switch(choselanguage) @@ -2339,25 +2339,17 @@ GLOBAL_LIST_EMPTY(preferences_datums) language = /datum/language/arachnid if("Beachtongue") language = /datum/language/beachbum - if("Codespeak") - language = /datum/language/codespeak if("Draconic") language = /datum/language/draconic if("Dwarven") language = /datum/language/dwarf if("Chimpanzee") language = /datum/language/monkey - if("Nar'sian") - language = /datum/language/narsie - if("Ratvarian") - language = /datum/language/ratvar if("Space Sign Language") language = /datum/language/signlanguage - if("Blah-Sucker") - language = /datum/language/vampiric if("Random") - language = pick(list("Rachidian", "Beachtongue","Codespeak","Draconic","Dwarven", - "Chimpanzee", "Nar'Sian","Ratvarian","Space Sign Language","Blah-Sucker")) + language = pick(list("Rachidian", "Beachtongue","Draconic","Dwarven", + "Chimpanzee", Space Sign Language",")) if("body_size") var/new_body_size = input(user, "Choose your desired sprite size: (90-125%)\nWarning: This may make your character look distorted. Additionally, any size under 100% takes a 10% maximum health penalty", "Character Preference", features["body_size"]*100) as num|null From 66cc55af3e679b1a9ea63e0dfb00fa89eb72e004 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 09:08:23 -0500 Subject: [PATCH 15/26] Update say.dm --- code/modules/mob/living/say.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 606daed0c5..561495bfc8 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -331,6 +331,9 @@ GLOBAL_LIST_INIT(department_radio_keys, list( /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels if(HAS_TRAIT(src, TRAIT_MUTE) && get_message_language(message) != /datum/language/signlanguage) return 0 + + if(get_message_language(message) == /datum/language/signlanguage && src.handcuffed) + return 0 if(is_muzzled()) return 0 From e47fdeab5da4e5599b429c27573af4ff7ce5dff9 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 09:10:34 -0500 Subject: [PATCH 16/26] Fixed typo --- code/modules/client/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4b0ee9677e..5e2a77934b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2349,7 +2349,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) language = /datum/language/signlanguage if("Random") language = pick(list("Rachidian", "Beachtongue","Draconic","Dwarven", - "Chimpanzee", Space Sign Language",")) + "Chimpanzee","Space Sign Language")) if("body_size") var/new_body_size = input(user, "Choose your desired sprite size: (90-125%)\nWarning: This may make your character look distorted. Additionally, any size under 100% takes a 10% maximum health penalty", "Character Preference", features["body_size"]*100) as num|null From ff8c8f12d9d2576159bca05476864248111f8cf3 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 09:14:44 -0500 Subject: [PATCH 17/26] Moving a thing --- code/modules/mob/living/say.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 561495bfc8..606daed0c5 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -331,9 +331,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list( /mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels if(HAS_TRAIT(src, TRAIT_MUTE) && get_message_language(message) != /datum/language/signlanguage) return 0 - - if(get_message_language(message) == /datum/language/signlanguage && src.handcuffed) - return 0 if(is_muzzled()) return 0 From 46e64d4dd3559926ee2fe64e4b07ce434e133ae4 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 09:15:43 -0500 Subject: [PATCH 18/26] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 27d0e9cbaf..4903d4a75e 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,6 +10,8 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 + if(get_message_language(message) == /datum/language/signlanguage && handcuffed != null) + return 0 return ..() /mob/living/carbon/could_speak_language(datum/language/language) From 643c4cf3689b4cd17885755b1460094a212056ff Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 09:31:57 -0500 Subject: [PATCH 19/26] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 4903d4a75e..d2ace66f69 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && handcuffed != null) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!user.get_bodypart(BODY_ZONE_L_ARM) && !user.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == held_items.len) return 0 return ..() From 3e9f14526d5b42bf65a69d8bb73a61d38d14dff2 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 09:35:24 -0500 Subject: [PATCH 20/26] Typofix --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index d2ace66f69..03f1eb041c 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!user.get_bodypart(BODY_ZONE_L_ARM) && !user.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == held_items.len) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!user.get_bodypart(BODY_ZONE_L_ARM) && !user.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == held_items.len)) return 0 return ..() From f009249f7e155c6c7a1e5d7e4a90605af0574f68 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Mon, 1 Feb 2021 09:38:38 -0500 Subject: [PATCH 21/26] Update say.dm --- code/modules/mob/living/carbon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm index 03f1eb041c..d75843a3e5 100644 --- a/code/modules/mob/living/carbon/say.dm +++ b/code/modules/mob/living/carbon/say.dm @@ -10,7 +10,7 @@ /mob/living/carbon/can_speak_vocal(message) if(silent) return 0 - if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!user.get_bodypart(BODY_ZONE_L_ARM) && !user.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == held_items.len)) + if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == held_items.len)) return 0 return ..() From 44366a4a2ea954333bf15d1777a7e40f2941f642 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Thu, 4 Feb 2021 15:04:17 -0500 Subject: [PATCH 22/26] Currently removing phobia picking --- code/datums/traits/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 81edfcf55a..cd9074f101 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -333,7 +333,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) /datum/quirk/phobia/post_add() var/mob/living/carbon/human/H = quirk_holder - phobia = new(H.client.prefs.phobia) + phobia = new() H.gain_trauma(phobia, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/phobia/remove() From 26d911a643d49ad3ae4f55971a96821f7f32d08a Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Thu, 4 Feb 2021 15:07:52 -0500 Subject: [PATCH 23/26] Update preferences.dm --- code/modules/client/preferences.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 5e2a77934b..be1a842cf4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -99,7 +99,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/be_random_body = 0 //whether we'll have a random body every round var/gender = MALE //gender of character (well duh) var/age = 30 //age of character - var/phobia = "Random" //phobia var/language = "Random" //bonus language var/choselanguage = "Random" //language appearance var/underwear = "Nude" //underwear type @@ -2320,15 +2319,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["body_model"] = chosengender gender = chosengender - if("phobia") - var/chosephobia = input(user, "Select a phobia.", "Phobia", phobia) as null|anything in list("spiders", "space", "security", "clowns", "greytide", "lizards", - "skeletons", "snakes", "robots", "doctors", "authority", "the supernatural", - "aliens", "strangers", "birds", "falling", "anime", "mimes", "cats", "syndicate", - "eye","Random") - if(!chosephobia) - return - phobia = chosephobia - if("language") choselanguage = input(user, "Select a language.", "Language", language) as null|anything in list("Beachtongue","Draconic","Dwarven", "Chimpanzee","Space Sign Language","Random") From 7ffbc07e032b57e87e0c25c511906eb7dc4cf6b3 Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Thu, 4 Feb 2021 15:08:32 -0500 Subject: [PATCH 24/26] Update preferences.dm --- code/modules/client/preferences.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index be1a842cf4..572c71b1e0 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -310,7 +310,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]
" dat += "Age: [age]
" - dat += "Phobia: [phobia]
" dat += "Language: [choselanguage]
" dat += "Special Names:
" From fb592b70a1556c99b5062c55220ee31c12c3844b Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Thu, 4 Feb 2021 15:10:12 -0500 Subject: [PATCH 25/26] Update negative.dm --- code/datums/traits/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index cd9074f101..3cbf4b3cd2 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -333,7 +333,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) /datum/quirk/phobia/post_add() var/mob/living/carbon/human/H = quirk_holder - phobia = new() + phobia = new H.gain_trauma(phobia, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/phobia/remove() From d1b7b191d28d894a6aeb754c10193b44e6fbf6ce Mon Sep 17 00:00:00 2001 From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com> Date: Thu, 4 Feb 2021 15:14:20 -0500 Subject: [PATCH 26/26] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 831c5040c2..088f7753cf 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -604,7 +604,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["body_model"] >> features["body_model"] S["body_size"] >> features["body_size"] S["age"] >> age - S["phobia"] >> phobia S["language"] >> language S["choselanguage"] >> choselanguage S["hair_color"] >> hair_color @@ -950,7 +949,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["body_model"] , features["body_model"]) WRITE_FILE(S["body_size"] , features["body_size"]) WRITE_FILE(S["age"] , age) - WRITE_FILE(S["phobia"] , phobia) WRITE_FILE(S["language"] , language) WRITE_FILE(S["choselanguage"] , choselanguage) WRITE_FILE(S["hair_color"] , hair_color)