Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from Nov 2, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec2acc9
Завтра ХоС-ящеры, честно
NinjaPikachuska Sep 14, 2023
260857f
Суп с шерстью
NinjaPikachuska Sep 14, 2023
623ca2a
Merge branch 'master' into liberty
NinjaPikachuska Oct 11, 2023
97fbb35
tajarastation
NinjaPikachuska Oct 23, 2023
cc57150
Merge branch 'master' into liberty
NinjaPikachuska Oct 23, 2023
5814cc1
Apply suggestions from code review
volas Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/jobs/job/captain.dm
View file
Open in desktop
Expand Up @@ -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

Expand Down
8 changes: 3 additions & 5 deletions code/game/jobs/job/civilian.dm
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/engineering.dm
View file
Open in desktop
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions code/game/jobs/job/medical.dm
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
1 change: 0 additions & 1 deletion code/game/jobs/job/science.dm
View file
Open in desktop
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/security.dm
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions code/modules/client/preferences_savefile.dm
View file
Open in desktop
Expand Up @@ -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
Expand Down