cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery

Browse Source 
Conflicts:
	code/datums/datacore.dm
	code/defines/obj.dm
This commit is contained in:
PsiOmegaDelta
2015-08-13 08:11:32 +02:00
parent 5ebe86ed8d ac80136603
commit db565ae2ff
425 changed files with 9891 additions and 8955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/defines/obj.dm
View File

@@ -43,7 +43,7 @@
* This item is completely unused, but removing it will break something in R&D and Radio code causing PDA and Ninja code to fail on compile
*/
/var/list/acting_rank_prefixes = list("acting", "temporary", "interim")
/var/list/acting_rank_prefixes = list("acting", "temporary", "interim", "provisional")
/proc/make_list_rank(rank)
for(var/prefix in acting_rank_prefixes)