From 82185eea9ed540e04f42311c547100534a5f3029 Mon Sep 17 00:00:00 2001
From: TheTitanicEngineer
 <60545092+TheTitanicEngineer@users.noreply.github.com>
Date: Mon, 29 Jan 2024 22:05:26 +0300
Subject: [PATCH] [MIRROR] Increases SKILL_DEVICES cap for the CE

---
 maps/torch/job/command_jobs.dm     | 18 ++++++++++++++++++
 maps/torch/job/engineering_jobs.dm |  9 +++++++++
 2 files changed, 27 insertions(+)

diff --git a/maps/torch/job/command_jobs.dm b/maps/torch/job/command_jobs.dm
index 930ed0055e404..e039e035e1ef4 100644
--- a/maps/torch/job/command_jobs.dm
+++ b/maps/torch/job/command_jobs.dm
@@ -193,6 +193,7 @@
 		/datum/mil_rank/fleet/o2,
 		/datum/mil_rank/fleet/o3
 	)
+<<<<<<< ours
 	min_skill = list(   SKILL_BUREAUCRACY  = SKILL_BASIC,
 	                    SKILL_COMPUTER     = SKILL_TRAINED,
 	                    SKILL_EVA          = SKILL_TRAINED,
@@ -200,12 +201,29 @@
 	                    SKILL_ELECTRICAL   = SKILL_TRAINED,
 	                    SKILL_ATMOS        = SKILL_TRAINED,
 	                    SKILL_ENGINES      = SKILL_EXPERIENCED)
+=======
+	skill_points = 36
+	min_skill = list( // 31 points
+		SKILL_BUREAUCRACY  = SKILL_BASIC, // 1 point
+		SKILL_COMPUTER = SKILL_TRAINED, // 2 points
+		SKILL_EVA = SKILL_TRAINED, // 2 points
+		SKILL_CONSTRUCTION = SKILL_TRAINED, // 2 points
+		SKILL_ELECTRICAL = SKILL_TRAINED, // 4 points
+		SKILL_ATMOS = SKILL_TRAINED, // 4 points
+		SKILL_ENGINES = SKILL_EXPERIENCED // 16 points
+	)
+>>>>>>> theirs
 
 	max_skill = list(   SKILL_CONSTRUCTION = SKILL_MAX,
 	                    SKILL_ELECTRICAL   = SKILL_MAX,
 	                    SKILL_ATMOS        = SKILL_MAX,
+<<<<<<< ours
 	                    SKILL_ENGINES      = SKILL_MAX)
 	skill_points = 30
+=======
+	                    SKILL_ENGINES      = SKILL_MAX,
+						SKILL_DEVICES = SKILL_EXPERIENCED)
+>>>>>>> theirs
 
 	access = list(
 		access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks, access_emergency_storage,
diff --git a/maps/torch/job/engineering_jobs.dm b/maps/torch/job/engineering_jobs.dm
index ff139ad8761cd..a3b04cc348791 100644
--- a/maps/torch/job/engineering_jobs.dm
+++ b/maps/torch/job/engineering_jobs.dm
@@ -31,8 +31,17 @@
 	max_skill = list(   SKILL_CONSTRUCTION = SKILL_MAX,
 						SKILL_ELECTRICAL   = SKILL_MAX,
 						SKILL_ATMOS        = SKILL_MAX,
+<<<<<<< ours
+<<<<<<< ours
 						SKILL_ENGINES      = SKILL_MAX)
 	skill_points = 20
+=======
+						SKILL_ENGINES      = SKILL_MAX,
+						SKILL_DEVICES = SKILL_EXPERIENCED)
+>>>>>>> theirs
+=======
+						SKILL_ENGINES      = SKILL_MAX)
+>>>>>>> theirs
 
 	access = list(
 		access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks, access_emergency_storage,