From 858fac428563f6cf6d120ecd599611ed2b0e4252 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 29 May 2024 11:23:47 -0400
Subject: [PATCH] Psychic refactor

---
 .../Roles/Jobs/Epistemics/forensicmantis.yml  | 21 -------------------
 .../Roles/Jobs/Science/research_director.yml  | 14 -------------
 2 files changed, 35 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 6a1d392f23..13debdef57 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -3,32 +3,11 @@
   name: job-name-mantis
   description: job-description-mantis
   playTimeTracker: JobForensicMantis
-<<<<<<< HEAD
-  # requirements:
-    # - !type:OverallPlaytimeRequirement
-      # time: 18000
-    # - !type:DepartmentTimeRequirement
-      # department: Science
-      # time: 3600
   startingGear: ForensicMantisGear
   icon: "JobIconForensicMantis"
   supervisors: job-supervisors-rd
   antagAdvantage: 5 # DeltaV - From 4 to 5
-  canBeAntag: true 
-  # whitelistRequired: true
-=======
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 18000
-    - !type:DepartmentTimeRequirement
-      department: Epistemics
-      time: 3600
-  startingGear: ForensicMantisGear
-  icon: "JobIconForensicMantis"
-  supervisors: job-supervisors-rd
-  antagAdvantage: 5
   canBeAntag: true
->>>>>>> my-fork/Psionic-Power-Refactor
   access:
   - Research
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index a750b60be1..3aaf007e36 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -3,17 +3,7 @@
   name: job-name-rd
   description: job-description-rd
   playTimeTracker: JobResearchDirector
-<<<<<<< HEAD
   antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
-=======
-  antagAdvantage: 6
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Epistemics
-      time: 54000
-    - !type:OverallPlaytimeRequirement
-      time: 72000
->>>>>>> my-fork/Psionic-Power-Refactor
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
@@ -25,12 +15,8 @@
   - Command
   - Maintenance
   - ResearchDirector
-<<<<<<< HEAD
-  - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
-=======
   - Mantis
   - Chapel
->>>>>>> my-fork/Psionic-Power-Refactor
   - Cryogenics
   special:
   - !type:AddComponentSpecial