Небольшие перестановки ксено-запретов должностей (TauCetiStation#12086)

* Завтра ХоС-ящеры, честно * Суп с шерстью * tajarastation * Apply suggestions from code review --------- Co-authored-by: Alexander V <[email protected]>
Riverz1 · Nov 2, 2023 · bd00ac3 · bd00ac3
1 parent a825fa6
commit bd00ac3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 20 deletions.
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
@@ -60,7 +60,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX, IPC)
+	restricted_species = list(UNATHI, TAJARAN, DIONA, VOX)
 	skillsets = list("Head of Personnel" = /datum/skillset/hop)
 	flags = JOB_FLAG_COMMAND|JOB_FLAG_HEAD_OF_STAFF|JOB_FLAG_BLUESHIELD_PROTEC
 

diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
@@ -21,7 +21,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(UNATHI, TAJARAN, VOX, DIONA)
+	restricted_species = list(TAJARAN, VOX, DIONA)
 
 	department_stocks = list("Cargo" = 40)
 	flags = JOB_FLAG_CARGO
@@ -88,7 +88,6 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(DIONA)
 
 	department_stocks = list("Cargo" = 10)
 	flags = JOB_FLAG_CARGO
@@ -115,7 +114,6 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(TAJARAN)
 	flags = JOB_FLAG_CIVIL
 
 /datum/job/chef
@@ -140,7 +138,6 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(TAJARAN)
 	flags = JOB_FLAG_CIVIL
 
 /datum/job/hydro
@@ -237,7 +234,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX)
+	restricted_species = list(SKRELL, UNATHI, TAJARAN, DIONA, VOX, IPC)
 	flags = JOB_FLAG_CIVIL|JOB_FLAG_BLUESHIELD_PROTEC
 
 /datum/job/clown
@@ -255,6 +252,7 @@
 	minimal_player_ingame_minutes = 120
 	outfit = /datum/outfit/job/clown
 	skillsets = list("Clown" = /datum/skillset/clown)
+	restricted_species = list(SKRELL)
 	flags = JOB_FLAG_CIVIL
 
 /datum/job/clown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)

diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
@@ -27,7 +27,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(UNATHI, TAJARAN, VOX, DIONA)
+	restricted_species = list(TAJARAN, VOX, DIONA)
 	flags = JOB_FLAG_COMMAND|JOB_FLAG_ENGINEERING|JOB_FLAG_HEAD_OF_STAFF|JOB_FLAG_BLUESHIELD_PROTEC
 
 /datum/job/engineer

diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
@@ -61,7 +61,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(UNATHI, TAJARAN, DIONA)
+	restricted_species = list(UNATHI, DIONA)
 
 	department_stocks = list("Medical" = 20)
 	flags = JOB_FLAG_MEDBAY
@@ -87,15 +87,11 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(IPC)
 
 	department_stocks = list("Medical" = 15)
 	flags = JOB_FLAG_MEDBAY
 
-// Slow species shouldn't be paramedics.
-/datum/job/paramedic/special_species_check(datum/species/S)
-	return S.speed_mod <= 1
-
+	restricted_species = list(DIONA)// Slow species shouldn't be paramedics.
 
 //Chemist is a medical job damnit	//YEAH FUCK YOU SCIENCE	-Pete	//Guys, behave -Erro
 /datum/job/chemist
@@ -159,7 +155,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(UNATHI, TAJARAN, DIONA)
+	restricted_species = list(UNATHI)
 
 	department_stocks = list("Medical" = 10)
 	flags = JOB_FLAG_MEDBAY
@@ -181,6 +177,8 @@
 	outfit = /datum/outfit/job/psychiatrist
 	skillsets = list("Psychiatrist" = /datum/skillset/psychiatrist)
 
+	restricted_species = list(UNATHI)
+
 	department_stocks = list("Medical" = 10)
 	flags = JOB_FLAG_MEDBAY
 

diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
@@ -73,7 +73,6 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(IPC)
 	flags = JOB_FLAG_SCIENCE
 
 /datum/job/xenobiologist

diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
@@ -77,7 +77,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(DIONA)
+	restricted_species = list(DIONA, IPC)
 	flags = JOB_FLAG_SECURITY|JOB_FLAG_IMPOSTER_PRIORITIZE
 
 /datum/job/officer
@@ -127,7 +127,7 @@
 		AND BUMPING UP THE SAVEFILE_VERSION_MAX, AND SAVEFILE_VERSION_SPECIES_JOBS
 		~Luduk
 	*/
-	restricted_species = list(UNATHI, TAJARAN, DIONA)
+	restricted_species = list(UNATHI, DIONA)
 	flags = JOB_FLAG_SECURITY|JOB_FLAG_IMPOSTER_PRIORITIZE
 
 /datum/job/cadet

diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
@@ -3,12 +3,11 @@
 
 //This is the current version, anything below this will attempt to update (if it's not obsolete)
 
-#define SAVEFILE_VERSION_MAX 46
-
+#define SAVEFILE_VERSION_MAX 47
 
 //For repetitive updates, should be the same or below SAVEFILE_VERSION_MAX
 //set this to (current SAVEFILE_VERSION_MAX)+1 when you need to update:
-#define SAVEFILE_VERSION_SPECIES_JOBS 41 // job preferences after breaking changes to any /datum/job/
+#define SAVEFILE_VERSION_SPECIES_JOBS 47 // job preferences after breaking changes to any /datum/job/
 #define SAVEFILE_VERSION_QUIRKS 30 // quirks preferences after breaking changes to any /datum/quirk/
 //breaking changes is when you remove any existing quirk/job or change their restrictions
 //Don't forget to bump SAVEFILE_VERSION_MAX too