From 1a16d84bb5f3b0258032db7242e3ce2c5577a4bd Mon Sep 17 00:00:00 2001 From: PrismaticGynoid Date: Mon, 30 Jul 2018 19:49:55 -0700 Subject: [PATCH 1/2] Lets people be colorblind Adds four types of colorblindness to the traits in the setup menu - protanopia, deuteranopia, tritanopia, and monochromacy. Previously, there were ones defined in the code, but not actually usable to players. --- .../preference_setup/traits/trait_defines.dm | 24 +++++++++++++ code/modules/mob/_modifiers/traits.dm | 34 ++++++++++++++----- .../PrismaticGynoid-colorblindnessforall.yml | 6 ++++ 3 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 html/changelogs/PrismaticGynoid-colorblindnessforall.yml diff --git a/code/modules/client/preference_setup/traits/trait_defines.dm b/code/modules/client/preference_setup/traits/trait_defines.dm index f8405eb7f8..fae2af8e8b 100644 --- a/code/modules/client/preference_setup/traits/trait_defines.dm +++ b/code/modules/client/preference_setup/traits/trait_defines.dm @@ -92,6 +92,30 @@ modifier_type = /datum/modifier/trait/larger mutually_exclusive = list(/datum/trait/modifier/physical/smaller, /datum/trait/modifier/physical/small, /datum/trait/modifier/physical/large) +/datum/trait/modifier/physical/colorblind_protanopia + name = "Protanopia" + desc = "You have a form of red-green colorblindness. You cannot see reds, and have trouble distinguishing them from yellows and greens." + modifier_type = /datum/modifier/trait/colorblind_protanopia + mutually_exclusive = list(/datum/trait/modifier/physical/colorblind_deuteranopia, /datum/trait/modifier/physical/colorblind_tritanopia, /datum/trait/modifier/physical/colorblind_monochrome) + +/datum/trait/modifier/physical/colorblind_deuteranopia + name = "Deuteranopia" + desc = "You have a form of red-green colorblindness. You cannot see greens, and have trouble distinguishing between yellows and reds." + modifier_type = /datum/modifier/trait/colorblind_deuteranopia + mutually_exclusive = list(/datum/trait/modifier/physical/colorblind_protanopia, /datum/trait/modifier/physical/colorblind_tritanopia, /datum/trait/modifier/physical/colorblind_monochrome) + +/datum/trait/modifier/physical/colorblind_tritanopia + name = "Tritanopia" + desc = "You have a form of blue-yellow colorblindness. You have trouble distinguishing between blues, greens, and yellows, and see blues and violets as dim." + modifier_type = /datum/modifier/trait/colorblind_tritanopia + mutually_exclusive = list(/datum/trait/modifier/physical/colorblind_protanopia, /datum/trait/modifier/physical/colorblind_deuteranopia, /datum/trait/modifier/physical/colorblind_monochrome) + +/datum/trait/modifier/physical/colorblind_monochrome + name = "Monochromacy" + desc = "You are fully colorblind. Your condition is rare, but you can see no colors at all." + modifier_type = /datum/modifier/trait/colorblind_monochrome + mutually_exclusive = list(/datum/trait/modifier/physical/colorblind_protanopia, /datum/trait/modifier/physical/colorblind_deuteranopia, /datum/trait/modifier/physical/colorblind_tritanopia) + // These two traits might be borderline, feel free to remove if they get abused. /datum/trait/modifier/physical/high_metabolism name = "High Metabolism" diff --git a/code/modules/mob/_modifiers/traits.dm b/code/modules/mob/_modifiers/traits.dm index e510798001..798501bb99 100644 --- a/code/modules/mob/_modifiers/traits.dm +++ b/code/modules/mob/_modifiers/traits.dm @@ -84,20 +84,38 @@ icon_scale_percent = 0.9 +/datum/modifier/trait/colorblind_protanopia + name = "Protanopia" + desc = "You have a form of red-green colorblindness. You cannot see reds, and have trouble distinguishing them from yellows and greens." + + client_color = MATRIX_Protanopia + +/datum/modifier/trait/colorblind_deuteranopia + name = "Deuteranopia" + desc = "You have a form of red-green colorblindness. You cannot see greens, and have trouble distinguishing between yellows and reds." + + client_color = MATRIX_Deuteranopia + +/datum/modifier/trait/colorblind_tritanopia + name = "Tritanopia" + desc = "You have a form of blue-yellow colorblindness. You have trouble distinguishing between blues, greens, and yellows, and see blues and violets as dim." + + client_color = MATRIX_Tritanopia + /datum/modifier/trait/colorblind_taj - name = "Colorblind - B+R" + name = "Colorblind - Blue-red" desc = "You are colorblind. You have a minor issue with blue colors and have difficulty recognizing them from red colors." - + client_color = MATRIX_Taj_Colorblind /datum/modifier/trait/colorblind_vulp - name = "Colorblind - G+R" + name = "Colorblind - Red-green" desc = "You are colorblind. You have a severe issue with green colors and have difficulty recognizing them from red colors." - + client_color = MATRIX_Vulp_Colorblind -/datum/modifier/trait/colorblind_mono - name = "Colorblind - Mono" - desc = "You are colorblind. Your condition is rare, but you can see no colors at all." - +/datum/modifier/trait/colorblind_monochrome + name = "Monochromacy" + desc = "You are fully colorblind. Your condition is rare, but you can see no colors at all." + client_color = MATRIX_Monochromia diff --git a/html/changelogs/PrismaticGynoid-colorblindnessforall.yml b/html/changelogs/PrismaticGynoid-colorblindnessforall.yml new file mode 100644 index 0000000000..ea8c6b259b --- /dev/null +++ b/html/changelogs/PrismaticGynoid-colorblindnessforall.yml @@ -0,0 +1,6 @@ +author: PrismaticGynoid + +delete-after: True + +changes: + - rscadd: "Adds four types of colorblindness to the traits in the setup menu." From 31e5769ff6a887dc942f851a2c927b15390369c8 Mon Sep 17 00:00:00 2001 From: PrismaticGynoid Date: Mon, 30 Jul 2018 22:08:31 -0700 Subject: [PATCH 2/2] Whoops, worded that wrong --- code/modules/client/preference_setup/traits/trait_defines.dm | 2 +- code/modules/mob/_modifiers/traits.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/traits/trait_defines.dm b/code/modules/client/preference_setup/traits/trait_defines.dm index fae2af8e8b..82e3aee738 100644 --- a/code/modules/client/preference_setup/traits/trait_defines.dm +++ b/code/modules/client/preference_setup/traits/trait_defines.dm @@ -100,7 +100,7 @@ /datum/trait/modifier/physical/colorblind_deuteranopia name = "Deuteranopia" - desc = "You have a form of red-green colorblindness. You cannot see greens, and have trouble distinguishing between yellows and reds." + desc = "You have a form of red-green colorblindness. You cannot see greens, and have trouble distinguishing them from yellows and reds." modifier_type = /datum/modifier/trait/colorblind_deuteranopia mutually_exclusive = list(/datum/trait/modifier/physical/colorblind_protanopia, /datum/trait/modifier/physical/colorblind_tritanopia, /datum/trait/modifier/physical/colorblind_monochrome) diff --git a/code/modules/mob/_modifiers/traits.dm b/code/modules/mob/_modifiers/traits.dm index 798501bb99..d0b0abfd89 100644 --- a/code/modules/mob/_modifiers/traits.dm +++ b/code/modules/mob/_modifiers/traits.dm @@ -92,7 +92,7 @@ /datum/modifier/trait/colorblind_deuteranopia name = "Deuteranopia" - desc = "You have a form of red-green colorblindness. You cannot see greens, and have trouble distinguishing between yellows and reds." + desc = "You have a form of red-green colorblindness. You cannot see greens, and have trouble distinguishing them from yellows and reds." client_color = MATRIX_Deuteranopia