From d8aa20b4e99e3ab92eb2c46985a948a6ddefb080 Mon Sep 17 00:00:00 2001 From: TheSpaghetti <37235090+TheSpaghetti@users.noreply.github.com> Date: Sun, 12 Jul 2020 13:11:06 -0400 Subject: [PATCH 1/7] Adds monophobia quirk --- code/datums/traits/negative.dm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 40b71eec0a..76d2ce9b6b 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -452,3 +452,21 @@ GLOBAL_LIST_EMPTY(family_heirlooms) mob_trait = TRAIT_COLDBLOODED gain_text = "You feel cold-blooded." lose_text = "You feel more warm-blooded." + + /datum/quirk/monophobia + name = "Monophobia" + desc = "You will become increasingly stressed when not in company of others, triggering panic reactions ranging from sickness to heart attacks.." + value = -3 // Might change it to 4. + gain_text = "You feel really lonely..." + lose_text = "You feel like you could be safe on your own." + medical_record_text = "Patient feels sick and distressed when not around other people, leading to potentially lethal levels of stress." + var/datum/brain_trauma/severe/monophobia + +/datum/quirk/monophobia/post_add() + var/mob/living/carbon/human/H = quirk_holder + monophobia = new + H.gain_trauma(monophobia, TRAUMA_RESILIENCE_ABSOLUTE) + +/datum/quirk/monophobia/remove() + var/mob/living/carbon/human/H = quirk_holder + H?.cure_trauma_type(monophobia, TRAUMA_RESILIENCE_ABSOLUTE) From 0200c4ca1f0390c410f7563f5f6c33eff940d65a Mon Sep 17 00:00:00 2001 From: TheSpaghetti <37235090+TheSpaghetti@users.noreply.github.com> Date: Sun, 12 Jul 2020 13:13:25 -0400 Subject: [PATCH 2/7] Fixed the double period. Whoops. --- 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 76d2ce9b6b..364151f2a1 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -455,7 +455,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) /datum/quirk/monophobia name = "Monophobia" - desc = "You will become increasingly stressed when not in company of others, triggering panic reactions ranging from sickness to heart attacks.." + desc = "You will become increasingly stressed when not in company of others, triggering panic reactions ranging from sickness to heart attacks." value = -3 // Might change it to 4. gain_text = "You feel really lonely..." lose_text = "You feel like you could be safe on your own." From a3531383d396573109ddeacb88d6add92bb23bda Mon Sep 17 00:00:00 2001 From: TheSpaghetti <37235090+TheSpaghetti@users.noreply.github.com> Date: Sun, 12 Jul 2020 15:29:32 -0400 Subject: [PATCH 3/7] "monophobia = new" isn't needed --- code/datums/traits/negative.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 364151f2a1..da9b36cf25 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -464,7 +464,6 @@ GLOBAL_LIST_EMPTY(family_heirlooms) /datum/quirk/monophobia/post_add() var/mob/living/carbon/human/H = quirk_holder - monophobia = new H.gain_trauma(monophobia, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/monophobia/remove() From cb8725d08db40adda7b1023009b12a683144c352 Mon Sep 17 00:00:00 2001 From: TheSpaghetti <37235090+TheSpaghetti@users.noreply.github.com> Date: Sun, 12 Jul 2020 17:20:08 -0400 Subject: [PATCH 4/7] ok maybe it is --- code/datums/traits/negative.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index da9b36cf25..364151f2a1 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -464,6 +464,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) /datum/quirk/monophobia/post_add() var/mob/living/carbon/human/H = quirk_holder + monophobia = new H.gain_trauma(monophobia, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/monophobia/remove() From 4b615b8a6fd2f1ffa883ae6c079fc8c61658ecb2 Mon Sep 17 00:00:00 2001 From: TheSpaghetti <37235090+TheSpaghetti@users.noreply.github.com> Date: Tue, 14 Jul 2020 02:20:27 -0400 Subject: [PATCH 5/7] It should actually work now. Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/datums/traits/negative.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 364151f2a1..8f902fa088 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -460,13 +460,13 @@ GLOBAL_LIST_EMPTY(family_heirlooms) gain_text = "You feel really lonely..." lose_text = "You feel like you could be safe on your own." medical_record_text = "Patient feels sick and distressed when not around other people, leading to potentially lethal levels of stress." - var/datum/brain_trauma/severe/monophobia /datum/quirk/monophobia/post_add() + . = ..() var/mob/living/carbon/human/H = quirk_holder - monophobia = new - H.gain_trauma(monophobia, TRAUMA_RESILIENCE_ABSOLUTE) + H.gain_trauma(/datum/brain_trauma/severe/monophobia, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/monophobia/remove() + . = ..() var/mob/living/carbon/human/H = quirk_holder - H?.cure_trauma_type(monophobia, TRAUMA_RESILIENCE_ABSOLUTE) + H?.cure_trauma_type(/datum/brain_trauma/severe/monophobia, TRAUMA_RESILIENCE_ABSOLUTE) From b2e95792171a2d81fafb8594a5d454d95ffdd630 Mon Sep 17 00:00:00 2001 From: TheSpaghetti <37235090+TheSpaghetti@users.noreply.github.com> Date: Fri, 17 Jul 2020 00:48:45 -0400 Subject: [PATCH 6/7] Fixes typos in the light sensitivity trait. It was bothering me. --- code/datums/traits/negative.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 8f902fa088..1566baa421 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -173,9 +173,9 @@ GLOBAL_LIST_EMPTY(family_heirlooms) name = "Light Sensitivity" desc = "Bright lights irritate you. Your eyes start to water, your skin feels itchy against the photon radiation, and your hair gets dry and frizzy. Maybe it's a medical condition. If only Nanotrasen was more considerate of your needs..." value = -1 - gain_text = "The safty of light feels off..." + gain_text = "The safety of light feels off..." lose_text = "Enlightening." - medical_record_text = "Despite my warnings, the patient refuses turn on the lights, only to end up rolling down a full flight of stairs and into the cellar." + medical_record_text = "Despite my warnings, the patient refuses to turn on the lights, only to end up rolling down a full flight of stairs and into the cellar." /datum/quirk/lightless/on_process() var/turf/T = get_turf(quirk_holder) From 16957d78e903714bc7f68a38a36455d9566ed5b0 Mon Sep 17 00:00:00 2001 From: TheSpaghetti <37235090+TheSpaghetti@users.noreply.github.com> Date: Sat, 18 Jul 2020 18:11:48 -0400 Subject: [PATCH 7/7] Makes the grammar bad again. For some reason the fixed grammar didn't compile. --- code/datums/traits/negative.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 1566baa421..8f902fa088 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -173,9 +173,9 @@ GLOBAL_LIST_EMPTY(family_heirlooms) name = "Light Sensitivity" desc = "Bright lights irritate you. Your eyes start to water, your skin feels itchy against the photon radiation, and your hair gets dry and frizzy. Maybe it's a medical condition. If only Nanotrasen was more considerate of your needs..." value = -1 - gain_text = "The safety of light feels off..." + gain_text = "The safty of light feels off..." lose_text = "Enlightening." - medical_record_text = "Despite my warnings, the patient refuses to turn on the lights, only to end up rolling down a full flight of stairs and into the cellar." + medical_record_text = "Despite my warnings, the patient refuses turn on the lights, only to end up rolling down a full flight of stairs and into the cellar." /datum/quirk/lightless/on_process() var/turf/T = get_turf(quirk_holder)