From 5c6f3b2d3a503a92d81fff2f3aca7d36e860062c Mon Sep 17 00:00:00 2001 From: foxcurl Date: Mon, 18 May 2026 13:11:13 -0400 Subject: [PATCH 1/6] adds weak narcolepsy trait --- Resources/Locale/en-US/_starcup/traits/traits.ftl | 3 +++ .../Prototypes/_starcup/Traits/disabilities.yml | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Resources/Locale/en-US/_starcup/traits/traits.ftl b/Resources/Locale/en-US/_starcup/traits/traits.ftl index caf4be0c5ea..134b686350c 100644 --- a/Resources/Locale/en-US/_starcup/traits/traits.ftl +++ b/Resources/Locale/en-US/_starcup/traits/traits.ftl @@ -21,3 +21,6 @@ trait-vowed-desc = You're serious about your vow, and uphold it outside of jobs trait-uncloneable-name = Uncloneable trait-uncloneable-desc = Due to some quirk in your physical composition, you cannot be reconstituted by medical cloning. + +trait-narcolepsy-weak-name = Narcolepsy (Weak) +trait-narcolepsy-weak-desc = You fall asleep randomly, but not as often nor for as long as other narcoleptics. \ No newline at end of file diff --git a/Resources/Prototypes/_starcup/Traits/disabilities.yml b/Resources/Prototypes/_starcup/Traits/disabilities.yml index a6a9cbe8055..180120370d9 100644 --- a/Resources/Prototypes/_starcup/Traits/disabilities.yml +++ b/Resources/Prototypes/_starcup/Traits/disabilities.yml @@ -7,3 +7,15 @@ - MKC components: - type: Uncloneable + +- type: trait + id: NarcolepsyWeak + name: trait-narcolepsy-weak-name + description: trait-narcolepsy-weak-desc + category: Disabilities + components: + - type: Narcolepsy + maxTimeBetweenIncidents: 1200 + minTimeBetweenIncidents: 600 + maxDurationOfIncident: 15 + minDurationOfIncident: 5 \ No newline at end of file From d70a0d9f5f81fb004a9d19e1bb4c35a2f440a962 Mon Sep 17 00:00:00 2001 From: foxcurl Date: Mon, 18 May 2026 13:16:36 -0400 Subject: [PATCH 2/6] separate into new category --- Resources/Locale/en-US/_starcup/traits/traits.ftl | 2 ++ Resources/Prototypes/Traits/disabilities.yml | 2 +- Resources/Prototypes/_starcup/Traits/categories.yml | 5 +++++ Resources/Prototypes/_starcup/Traits/disabilities.yml | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/_starcup/traits/traits.ftl b/Resources/Locale/en-US/_starcup/traits/traits.ftl index 134b686350c..e73f412427d 100644 --- a/Resources/Locale/en-US/_starcup/traits/traits.ftl +++ b/Resources/Locale/en-US/_starcup/traits/traits.ftl @@ -1,3 +1,5 @@ +trait-category-narcolepsy = Narcolepsy + trait-scottish-accent-name = Highlander trait-scottish-accent-desc = Hailing frae hielans ae rock and thistle, ya dinnae ken why others sometimes cannae understand wot ya say. diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml index 8ebefaea42e..72282359325 100644 --- a/Resources/Prototypes/Traits/disabilities.yml +++ b/Resources/Prototypes/Traits/disabilities.yml @@ -31,7 +31,7 @@ id: Narcolepsy name: trait-narcolepsy-name description: trait-narcolepsy-desc - category: Disabilities + category: Narcolepsy # starcup: add weaker narcolepsy trait components: - type: Narcolepsy maxTimeBetweenIncidents: 600 diff --git a/Resources/Prototypes/_starcup/Traits/categories.yml b/Resources/Prototypes/_starcup/Traits/categories.yml index 81ae1f76303..c3b041cac3f 100644 --- a/Resources/Prototypes/_starcup/Traits/categories.yml +++ b/Resources/Prototypes/_starcup/Traits/categories.yml @@ -2,3 +2,8 @@ id: Vision name: trait-category-vision maxTraitPoints: 1 + +- type: traitCategory + id: Narcolepsy + name: trait-category-narcolepsy + maxTraitPoints: 1 diff --git a/Resources/Prototypes/_starcup/Traits/disabilities.yml b/Resources/Prototypes/_starcup/Traits/disabilities.yml index 180120370d9..9ce884a40ed 100644 --- a/Resources/Prototypes/_starcup/Traits/disabilities.yml +++ b/Resources/Prototypes/_starcup/Traits/disabilities.yml @@ -12,7 +12,7 @@ id: NarcolepsyWeak name: trait-narcolepsy-weak-name description: trait-narcolepsy-weak-desc - category: Disabilities + category: Narcolepsy components: - type: Narcolepsy maxTimeBetweenIncidents: 1200 From ddb5780ddcfd3d1ee0aebb98e79a298089b501a1 Mon Sep 17 00:00:00 2001 From: foxcurl Date: Mon, 18 May 2026 13:17:32 -0400 Subject: [PATCH 3/6] small comment for clarity --- Resources/Prototypes/_starcup/Traits/disabilities.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_starcup/Traits/disabilities.yml b/Resources/Prototypes/_starcup/Traits/disabilities.yml index 9ce884a40ed..816ed58f48d 100644 --- a/Resources/Prototypes/_starcup/Traits/disabilities.yml +++ b/Resources/Prototypes/_starcup/Traits/disabilities.yml @@ -15,7 +15,7 @@ category: Narcolepsy components: - type: Narcolepsy - maxTimeBetweenIncidents: 1200 + maxTimeBetweenIncidents: 1200 # min/max time is twice the base minTimeBetweenIncidents: 600 - maxDurationOfIncident: 15 + maxDurationOfIncident: 15 # min/max time is half the base minDurationOfIncident: 5 \ No newline at end of file From fa4940e3226d00340790e24ed57ebba6e6839cef Mon Sep 17 00:00:00 2001 From: foxcurl Date: Mon, 18 May 2026 13:17:44 -0400 Subject: [PATCH 4/6] make pills work for narcolepsy --- Resources/Prototypes/Reagents/medicine.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index a38be9e4cb7..b4f8cdf08bb 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -999,6 +999,13 @@ messages: ["ethyloxyephedrine-effect-feeling-awake", "ethyloxyephedrine-effect-clear-mind"] type: Local probability: 0.1 + Digestion: # starcup: make ethyloxyephedrine pills treat narcolepsy + effects: + - !type:ResetNarcolepsy + conditions: + - !type:ReagentCondition + reagent: Ethyloxyephedrine + min: 10 - type: reagent id: Diphenylmethylamine @@ -1025,6 +1032,13 @@ messages: ["ethyloxyephedrine-effect-feeling-awake", "ethyloxyephedrine-effect-clear-mind"] type: Local probability: 0.1 + Digestion: # starcup: make diphenylmethylamine pills treat narcolepsy + effects: + - !type:ResetNarcolepsy + conditions: + - !type:ReagentCondition + reagent: Diphenylmethylamine + min: 10 - type: reagent id: Sigynate From b04277e00f08d9b402777179189c807b1db44b8c Mon Sep 17 00:00:00 2001 From: foxcurl Date: Mon, 18 May 2026 13:19:01 -0400 Subject: [PATCH 5/6] let's split this into two prs --- Resources/Prototypes/Reagents/medicine.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index b4f8cdf08bb..a38be9e4cb7 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -999,13 +999,6 @@ messages: ["ethyloxyephedrine-effect-feeling-awake", "ethyloxyephedrine-effect-clear-mind"] type: Local probability: 0.1 - Digestion: # starcup: make ethyloxyephedrine pills treat narcolepsy - effects: - - !type:ResetNarcolepsy - conditions: - - !type:ReagentCondition - reagent: Ethyloxyephedrine - min: 10 - type: reagent id: Diphenylmethylamine @@ -1032,13 +1025,6 @@ messages: ["ethyloxyephedrine-effect-feeling-awake", "ethyloxyephedrine-effect-clear-mind"] type: Local probability: 0.1 - Digestion: # starcup: make diphenylmethylamine pills treat narcolepsy - effects: - - !type:ResetNarcolepsy - conditions: - - !type:ReagentCondition - reagent: Diphenylmethylamine - min: 10 - type: reagent id: Sigynate From 8e44b6cb1dc4f21f2ce85937a766016ce1d8481f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 18 May 2026 17:34:56 +0000 Subject: [PATCH 6/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Resources/Locale/en-US/_starcup/traits/traits.ftl | 2 +- Resources/Prototypes/_starcup/Traits/disabilities.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/_starcup/traits/traits.ftl b/Resources/Locale/en-US/_starcup/traits/traits.ftl index e73f412427d..abfdacd34bc 100644 --- a/Resources/Locale/en-US/_starcup/traits/traits.ftl +++ b/Resources/Locale/en-US/_starcup/traits/traits.ftl @@ -25,4 +25,4 @@ trait-uncloneable-name = Uncloneable trait-uncloneable-desc = Due to some quirk in your physical composition, you cannot be reconstituted by medical cloning. trait-narcolepsy-weak-name = Narcolepsy (Weak) -trait-narcolepsy-weak-desc = You fall asleep randomly, but not as often nor for as long as other narcoleptics. \ No newline at end of file +trait-narcolepsy-weak-desc = You fall asleep randomly, but not as often nor for as long as other narcoleptics. diff --git a/Resources/Prototypes/_starcup/Traits/disabilities.yml b/Resources/Prototypes/_starcup/Traits/disabilities.yml index 816ed58f48d..08ae4db6290 100644 --- a/Resources/Prototypes/_starcup/Traits/disabilities.yml +++ b/Resources/Prototypes/_starcup/Traits/disabilities.yml @@ -18,4 +18,4 @@ maxTimeBetweenIncidents: 1200 # min/max time is twice the base minTimeBetweenIncidents: 600 maxDurationOfIncident: 15 # min/max time is half the base - minDurationOfIncident: 5 \ No newline at end of file + minDurationOfIncident: 5