From cabf4cda8ebab2a65fd96bcf46ef8c731ad43d71 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sun, 10 Nov 2024 20:57:12 -0600 Subject: [PATCH 1/2] Remove the t3 lockout (#2144) * Comments it out * fixes it hopefully * yuh * forces all techs to be researched * comments Signed-off-by: Stop-Signs * i hope this is what milon meant * Update TechDisciplinePrototype.cs Signed-off-by: Stop-Signs * Update disciplines.yml Signed-off-by: Stop-Signs * Revert "Comments it out" This reverts commit 70779979220382c14aeaa31d8633fdd69d1666b6. --------- Signed-off-by: Stop-Signs --- Resources/Prototypes/Research/disciplines.yml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml index 7a661da1a33..b1547853275 100644 --- a/Resources/Prototypes/Research/disciplines.yml +++ b/Resources/Prototypes/Research/disciplines.yml @@ -5,10 +5,11 @@ icon: sprite: Interface/Misc/research_disciplines.rsi state: industrial + lockoutTier: 4 # DeltaV: Lockout occurs at t4 tierPrerequisites: 1: 0 - 2: 0.75 - 3: 0.75 + 2: 1 # DeltaV: raised to 1 + 3: 1 # DeltaV: raised to 1 - type: techDiscipline id: Arsenal @@ -17,10 +18,11 @@ icon: sprite: Interface/Misc/research_disciplines.rsi state: arsenal + lockoutTier: 4 # DeltaV: Lockout occurs at t4 tierPrerequisites: 1: 0 - 2: 0.75 - 3: 0.75 + 2: 1 # DeltaV: raised to 1 + 3: 1 # DeltaV: raised to 1 - type: techDiscipline id: Experimental @@ -29,10 +31,11 @@ icon: sprite: Interface/Misc/research_disciplines.rsi state: experimental + lockoutTier: 4 # DeltaV: Lockout occurs at t4 tierPrerequisites: 1: 0 - 2: 0.75 - 3: 0.75 + 2: 1 # DeltaV: raised to 1 + 3: 1 # DeltaV: raised to 1 - type: techDiscipline id: CivilianServices @@ -41,7 +44,8 @@ icon: sprite: Interface/Misc/research_disciplines.rsi state: civilianservices + lockoutTier: 4 # DeltaV: Lockout occurs at t4 tierPrerequisites: 1: 0 - 2: 0.75 - 3: 0.75 + 2: 1 # DeltaV: raised to 1 + 3: 1 # DeltaV: raised to 1 From b826e71392d121925389cc3084179bb1020c1615 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 11 Nov 2024 03:57:31 +0100 Subject: [PATCH 2/2] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 949f04b9513..1d36fdcfd7a 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: ps3moira - changes: - - message: Added Fish n' Chips. Thank the British! - type: Add - id: 167 - time: '2023-12-13T20:32:51.0000000+00:00' - author: Adrian16199 changes: - message: Felinids now meow out their words. They can also sigh now. @@ -3722,3 +3716,10 @@ id: 666 time: '2024-11-10T20:20:26.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2164 +- author: Stop-Signs + changes: + - message: Removed the T3 Lockout on epi techs + type: Remove + id: 667 + time: '2024-11-11T02:57:13.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2144