From fa1e2b1a0f52bb7dbd99291cdbbd80e40427788f Mon Sep 17 00:00:00 2001
From: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Date: Tue, 21 Dec 2021 16:31:20 -0500
Subject: [PATCH] Hopefully finally fixing CI + Config updates (#10182)

* Updated the jobs.txt file for parity with the server box

* Fixing strip_menu_ui_status

* Actually disables SSDecay by default
---
 code/modules/unit_tests/strippable.dm |  2 +
 config/jobs.txt                       | 86 +++++++++++++++------------
 config/skyrat/skyrat_config.txt       |  2 +-
 3 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/code/modules/unit_tests/strippable.dm b/code/modules/unit_tests/strippable.dm
index 2fa5e4f1f2a..bbdf7068ea4 100644
--- a/code/modules/unit_tests/strippable.dm
+++ b/code/modules/unit_tests/strippable.dm
@@ -8,6 +8,8 @@
 
 	var/datum/strip_menu/strip_menu = allocate(/datum/strip_menu, target, strippable)
 
+	run_loc_floor_bottom_left.luminosity = 6 // SKYRAT EDIT - Making this unit test pass by lighting a turf up.
+
 	var/ui_state = strip_menu.ui_state(user)
 
 	TEST_ASSERT_EQUAL(strip_menu.ui_status(user, ui_state), UI_INTERACTIVE, "Perfect conditions were not interactive.")
diff --git a/config/jobs.txt b/config/jobs.txt
index cdf9f0c0209..0d9a83530e1 100644
--- a/config/jobs.txt
+++ b/config/jobs.txt
@@ -3,7 +3,8 @@
 #Job names must be identical to the title var of each job datum
 #Positions can be set to -1 to allow unlimited slots
 
-#Station Command
+
+# Station Command
 
 Captain=1,1
 Head of Personnel=1,1
@@ -11,73 +12,80 @@ Head of Security=1,1
 Chief Engineer=1,1
 Research Director=1,1
 Chief Medical Officer=1,1
-
-#Misc.
-
-Assistant=-1,-1
-Prisoner=12,2
-
-#Cargo
-
 Quartermaster=1,1
-Cargo Technician=3,2
-Shaft Miner=5,5
 
-#Services
+
+# Central Command
+
+Nanotrasen Representative=1,1
+Blueshield=1,1
+
+
+# Cargo
+
+Cargo Technician=4,2
+Shaft Miner=4,4
+Customs Agent=2,2
+
+
+# Service
 
 Bartender=1,1
 Cook=2,1
+Barber=2,2
 Botanist=3,2
-Janitor=2,1
-Barber=1,1
-
+Janitor=5,5
 Clown=1,1
 Mime=1,1
-Curator=1,1
+Curator=2,2
 Lawyer=2,2
-
 Chaplain=1,1
+Psychologist=1,1
+Bouncer=2,2
 
-#Engineering
+
+# Engineering
 
 Station Engineer=5,5
 Atmospheric Technician=3,2
+Engineering Guard=2,2
 
-#Medical
+
+# Medical
 
 Medical Doctor=5,3
-Paramedic=2,2
+Paramedic=3,2
 Chemist=2,2
 Geneticist=2,2
 Virologist=1,1
-Psychologist=1,1
+Orderly=2,2
 
-#R&D
 
-Scientist=5,3
-Roboticist=2,2
-Vanguard Operative=2,2
+# Science
 
-#Security
+Scientist=5,5
+Roboticist=3,2
+Vanguard Operative=0,0
+Science Guard=2,2
+
+
+# Security
 
 Warden=1,1
-Security Sergeant=0,0
-Detective=1,1
-Security Officer=4,4
+Security Sergeant=1,1
+Detective=2,2
+Security Officer=6,6
 Security Medic=1,1
-Corrections Officer=1,1
-Civil Disputes Officer=4,4
+Corrections Officer=2,1
 
-#Silicon
+
+# Silicons
 
 AI=1,1
 Cyborg=3,3
 
-#Central Command
 
-Fleetmaster=1,1
-Bridge Officer=3,3
-Operations Inspector=1,1
-Nanotrasen Representative=1,1
-Deck Crewman=5,5
-Blueshield=1,1
+# Misc.
+
+Assistant=-1,-1
+Prisoner=12,12
diff --git a/config/skyrat/skyrat_config.txt b/config/skyrat/skyrat_config.txt
index f06ce1d1f92..6f556ac1907 100644
--- a/config/skyrat/skyrat_config.txt
+++ b/config/skyrat/skyrat_config.txt
@@ -67,7 +67,7 @@ PC_MOB_TEXT As a player controlled mob you are expected to play the role to the
 #RUSSIAN_TEXT_FORMATION
 
 ## Toggles off SSDecay when uncommented, HIGHLY recommended for map test-merges, to avoid giving it a bad first impression.
-#SSDECAY_DISABLED
+SSDECAY_DISABLED
 
 ## Disables any ERP preferences for codebases that don't want it.
 #DISABLE_ERP_PREFERENCES