From 2bdc5689efa3976f474a3d069813364a9cfb26cd Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Wed, 14 Aug 2024 00:02:15 -0400 Subject: [PATCH 1/5] Commented out the old loadout --- .../Prototypes/Loadouts/Jobs/science.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml index ad93e92557b..ac3a60ec547 100644 --- a/Resources/Prototypes/Loadouts/Jobs/science.yml +++ b/Resources/Prototypes/Loadouts/Jobs/science.yml @@ -46,19 +46,19 @@ items: - ClothingOuterCoatRnd -- type: loadout - id: LoadoutScienceOuterLabcoat - category: Jobs - cost: 2 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - Scientist - - ResearchAssistant - - ResearchDirector - items: - - ClothingOuterCoatLab +#- type: loadout +# id: LoadoutScienceOuterLabcoat +# category: Jobs +# cost: 2 +# exclusive: true +# requirements: +# - !type:CharacterJobRequirement +# jobs: +# - Scientist +# - ResearchAssistant +# - ResearchDirector +# items: +# - ClothingOuterCoatLab - type: loadout id: LoadoutScienceOuterLabcoatSeniorResearcher From 70dade1a5907f2e846e50927d0f3e5d5ce626f61 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Wed, 14 Aug 2024 00:03:20 -0400 Subject: [PATCH 2/5] Add the lab coat for EVERYONE (no identifying colors) --- Resources/Prototypes/Floof/Loadouts/outerClothing.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml index bfa87be3fea..0da8e5fc40c 100644 --- a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml @@ -11,3 +11,10 @@ cost: 3 items: - ClothingOuterRedRacoon + +- type: loadoutOuterCoatLab # Science is for everyone, not just science + id: LoadoutOuter + category: Outer + cost: 2 + items: + - ClothingOuterCoatLab From 63efd89edb46096b9fddd9b8db5fa067bf2f5fc4 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Wed, 14 Aug 2024 00:14:03 -0400 Subject: [PATCH 3/5] Makes loadout points to 20 (needs discussion) --- Content.Shared/CCVar/CCVars.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 1e06c6bef44..3cf175acd77 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -380,7 +380,7 @@ public static readonly CVarDef /// How many points to give to each player for loadouts. /// public static readonly CVarDef GameLoadoutsPoints = - CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED); + CVarDef.Create("game.loadouts_points", 20, CVar.REPLICATED); /// From dfa19bd8b80787d6271c5f0073419e4c26a044c1 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Wed, 14 Aug 2024 01:23:05 -0400 Subject: [PATCH 4/5] You can't prove anything (oh wait you can) --- Resources/Prototypes/Floof/Loadouts/outerClothing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml index 0da8e5fc40c..ac778965c57 100644 --- a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml @@ -12,8 +12,8 @@ items: - ClothingOuterRedRacoon -- type: loadoutOuterCoatLab # Science is for everyone, not just science - id: LoadoutOuter +- type: loadout # Science is for everyone, not just science + id: LoadoutOuterCoatLab category: Outer cost: 2 items: From e163fcd0833fe8fb4e9503decaf7fcafc14bf440 Mon Sep 17 00:00:00 2001 From: Fansana <116083121+Fansana@users.noreply.github.com> Date: Thu, 15 Aug 2024 01:49:17 +0200 Subject: [PATCH 5/5] Update CCVars.cs --- Content.Shared/CCVar/CCVars.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 3cf175acd77..1e06c6bef44 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -380,7 +380,7 @@ public static readonly CVarDef /// How many points to give to each player for loadouts. /// public static readonly CVarDef GameLoadoutsPoints = - CVarDef.Create("game.loadouts_points", 20, CVar.REPLICATED); + CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED); ///