cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tgstation/master'

Browse Source 
Not sure if this worked. Used a wonky special snowflake strat to merge.
This commit is contained in:
AsV9
2018-03-24 08:57:13 +01:00
parent 389f4ccac0
commit d338cac150
921 changed files with 8789 additions and 5779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/role_preferences.dm
View File

@@ -51,6 +51,6 @@ GLOBAL_LIST_INIT(special_roles, list(
))
//Job defines for what happens when you fail to qualify for any job during job selection
#define BEASSISTANT 1
#define BEOVERFLOW 1
#define BERANDOMJOB 2
#define RETURNTOLOBBY 3