Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the t3 lockout #2144

Merged
merged 13 commits into from
Nov 11, 2024
Merged

Remove the t3 lockout #2144

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7077997
Comments it out
Stop-Signs Nov 7, 2024
c7ea5a8
fixes it hopefully
Stop-Signs Nov 7, 2024
91afe49
Merge branch 'master' into fix-research
Stop-Signs Nov 7, 2024
648a329
yuh
Stop-Signs Nov 7, 2024
3d73bc1
Merge branch 'fix-research' of https://github.com/Stop-Signs/Delta-v …
Stop-Signs Nov 7, 2024
2ec4991
Merge branch 'master' into fix-research
Stop-Signs Nov 7, 2024
4550f90
forces all techs to be researched
Stop-Signs Nov 7, 2024
49a62b9
Merge branch 'fix-research' of https://github.com/Stop-Signs/Delta-v …
Stop-Signs Nov 7, 2024
7687710
comments
Stop-Signs Nov 7, 2024
cc9da1e
i hope this is what milon meant
Stop-Signs Nov 7, 2024
7b1218b
Update TechDisciplinePrototype.cs
Stop-Signs Nov 7, 2024
20883fc
Update disciplines.yml
Stop-Signs Nov 7, 2024
41ed29a
Revert "Comments it out"
Stop-Signs Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions Resources/Prototypes/Research/disciplines.yml
View file
Open in desktop
Stop-Signs marked this conversation as resolved.
Show resolved Hide resolved
Stop-Signs marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Loading