cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync

Browse Source
This commit is contained in:
Arokha Sieyes
2016-05-18 10:13:26 -04:00
parent 9dbb8c42b9 47176f4912
commit 7914c9d943
36 changed files with 2424 additions and 2052 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/antagonism/02_candidacy.dm
+1 -1
View File
@@ -10,7 +10,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
"alien candidate" = 1, //always show // 6
"positronic brain" = 1, // 7
"cultist" = IS_MODE_COMPILED("cult"), // 8
"infested monkey" = IS_MODE_COMPILED("monkey"), // 9
"renegade" = 1, // 9
"ninja" = "true", // 10
"raider" = IS_MODE_COMPILED("heist"), // 11
"diona" = 1, // 12
code/modules/client/preference_setup/occupation/occupation.dm
+2 -2
View File
@@ -49,10 +49,10 @@
if(!job_master)
return
for(var/datum/job/job in job_master.occupations)
/*for(var/datum/job/job in job_master.occupations)
var/alt_title = pref.player_alt_titles[job.title]
if(alt_title && !(alt_title in job.alt_titles))
pref.player_alt_titles -= job.title
pref.player_alt_titles -= job.title*/
/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 16, list/splitJobs = list("Chief Medical Officer"))
if(!job_master)