From 41547e61cf6155dd8e855e81b566e4c019887b89 Mon Sep 17 00:00:00 2001 From: TasiWeynad Date: Mon, 4 Nov 2024 08:20:25 +0700 Subject: [PATCH 1/4] Move discipline lock from T3 to T4 --- Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs index b48d8256b73..ea0a2f282ef 100644 --- a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs +++ b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs @@ -44,5 +44,5 @@ public sealed partial class TechDisciplinePrototype : IPrototype /// Purchasing this tier of technology causes a server to become "locked" to this discipline. /// [DataField("lockoutTier")] - public int LockoutTier = 3; + public int LockoutTier = 4; } From 60fd91c49b45115539257f7d60c5866e63e0f820 Mon Sep 17 00:00:00 2001 From: TasiWeynad Date: Fri, 8 Nov 2024 23:51:25 +0700 Subject: [PATCH 2/4] MoveDisciplineLockToT4Proto --- Resources/Prototypes/Research/disciplines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml index 7a661da1a33..3c859a21ca9 100644 --- a/Resources/Prototypes/Research/disciplines.yml +++ b/Resources/Prototypes/Research/disciplines.yml @@ -9,6 +9,7 @@ 1: 0 2: 0.75 3: 0.75 + lockoutTier: 4 - type: techDiscipline id: Arsenal @@ -21,6 +22,7 @@ 1: 0 2: 0.75 3: 0.75 + lockoutTier: 4 - type: techDiscipline id: Experimental @@ -33,6 +35,7 @@ 1: 0 2: 0.75 3: 0.75 + lockoutTier: 4 - type: techDiscipline id: CivilianServices @@ -45,3 +48,4 @@ 1: 0 2: 0.75 3: 0.75 + lockoutTier: 4 From a86d5f66695fbf80cceb92df392334f8d764f645 Mon Sep 17 00:00:00 2001 From: TasiWeynad Date: Fri, 8 Nov 2024 23:55:34 +0700 Subject: [PATCH 3/4] Reverting Move discipline lock from T3 toT4 --- Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs index ea0a2f282ef..b48d8256b73 100644 --- a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs +++ b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs @@ -44,5 +44,5 @@ public sealed partial class TechDisciplinePrototype : IPrototype /// Purchasing this tier of technology causes a server to become "locked" to this discipline. /// [DataField("lockoutTier")] - public int LockoutTier = 4; + public int LockoutTier = 3; } From 1f52151a286ec4c609cf957d7aa95c1938f0a9e8 Mon Sep 17 00:00:00 2001 From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com> Date: Sat, 9 Nov 2024 03:16:08 +0100 Subject: [PATCH 4/4] Apply suggestions from code review --- Resources/Prototypes/Research/disciplines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml index 3c859a21ca9..3a6a23bd538 100644 --- a/Resources/Prototypes/Research/disciplines.yml +++ b/Resources/Prototypes/Research/disciplines.yml @@ -9,7 +9,7 @@ 1: 0 2: 0.75 3: 0.75 - lockoutTier: 4 + lockoutTier: 4 # Corvax-Next-TechLock - type: techDiscipline id: Arsenal @@ -22,7 +22,7 @@ 1: 0 2: 0.75 3: 0.75 - lockoutTier: 4 + lockoutTier: 4 # Corvax-Next-TechLock - type: techDiscipline id: Experimental @@ -35,7 +35,7 @@ 1: 0 2: 0.75 3: 0.75 - lockoutTier: 4 + lockoutTier: 4 # Corvax-Next-TechLock - type: techDiscipline id: CivilianServices @@ -48,4 +48,4 @@ 1: 0 2: 0.75 3: 0.75 - lockoutTier: 4 + lockoutTier: 4 # Corvax-Next-TechLock