cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3877 from TheGreatKitsune/non-crew-role

Browse Source 
Non crew role added
This commit is contained in:
Nadyr
2022-10-29 19:08:16 -04:00
committed by GitHub
parent f9c63a2c86 315ee5b607
commit d77e4f84cb
19 changed files with 94077 additions and 2747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
code/modules/client/preference_setup/occupation/occupation.dm
View File

@@ -19,6 +19,11 @@
S["job_talon_high"] >> pref.job_talon_high
//VOREStation Add End
S["player_alt_titles"] >> pref.player_alt_titles
//CHOMPStation Add
S["job_other_low"] >> pref.job_other_low
S["job_other_med"] >> pref.job_other_med
S["job_other_high"] >> pref.job_other_high
//CHOMPStation Add End
/datum/category_item/player_setup_item/occupation/save_character(var/savefile/S)
S["alternate_option"] << pref.alternate_option
@@ -37,6 +42,11 @@
S["job_talon_high"] << pref.job_talon_high
//VOREStation Add End
S["player_alt_titles"] << pref.player_alt_titles
//CHOMPStation Add
S["job_other_low"] << pref.job_other_low
S["job_other_med"] << pref.job_other_med
S["job_other_high"] << pref.job_other_high
//CHOMPStation Add End
/datum/category_item/player_setup_item/occupation/sanitize_character()
pref.alternate_option = sanitize_integer(pref.alternate_option, 0, 2, initial(pref.alternate_option))
@@ -54,6 +64,11 @@
pref.job_talon_med = sanitize_integer(pref.job_talon_med, 0, 65535, initial(pref.job_talon_med))
pref.job_talon_low = sanitize_integer(pref.job_talon_low, 0, 65535, initial(pref.job_talon_low))
//VOREStation Add End
//CHOMPStation Add
pref.job_other_high = sanitize_integer(pref.job_other_high, 0, 65535, initial(pref.job_other_high))
pref.job_other_med = sanitize_integer(pref.job_other_med, 0, 65535, initial(pref.job_other_med))
pref.job_other_low = sanitize_integer(pref.job_other_low, 0, 65535, initial(pref.job_other_low))
//CHOMPStation Add End
if(!(pref.player_alt_titles)) pref.player_alt_titles = new()
if(!job_master)
@@ -320,6 +335,7 @@
pref.job_medsci_high = 0
pref.job_engsec_high = 0
pref.job_talon_high = 0 //VOREStation Add
pref.job_other_high = 0 //CHOMPStation Add
// Level is equal to the desired new level of the job. So for a value of 4, we want to disable the job.
/datum/category_item/player_setup_item/occupation/proc/SetJobDepartment(var/datum/job/job, var/level)
@@ -377,6 +393,20 @@
if(3)
pref.job_talon_low |= job.flag
VOREStation Add End*/
//CHOMPStation Add
if(OTHER)
pref.job_other_low &= ~job.flag
pref.job_other_med &= ~job.flag
pref.job_other_high &= ~job.flag
switch(level)
if(1)
reset_jobhigh()
pref.job_other_high = job.flag
if(2)
pref.job_other_med |= job.flag
if(3)
pref.job_other_low |= job.flag
//CHOMPStation Add End
return 1
@@ -399,6 +429,12 @@
pref.job_talon_low = 0
//VOREStation Add End
//CHOMPStation Add
pref.job_other_high = 0
pref.job_other_med = 0
pref.job_other_low = 0
//CHOMPStation Add End
pref.player_alt_titles.Cut()
/datum/preferences/proc/GetPlayerAltTitle(datum/job/job)
@@ -431,4 +467,14 @@
return job_engsec_med
if(3)
return job_engsec_low
//CHOMPStation Add
if(OTHER)
switch(level)
if(1)
return job_other_high
if(2)
return job_other_med
if(3)
return job_other_low
//CHOMPStation Add End
return 0