Merge branch 'master' into justice-stamps

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

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