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

Update datacore.dm

Browse Source
This commit is contained in:
Novacat
2020-03-09 01:56:51 -04:00
committed by GitHub
parent dd75b3c21c
commit 342f964e33
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/datums/datacore.dm
View File

@@ -73,16 +73,12 @@
if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CARGO))
car[name] = rank
department = 1
<<<<<<< HEAD
//VOREStation Edit Begin
if(real_rank in planet_positions)
pla[name] = rank
//VOREStation Add Begin
if(SSjob.is_job_in_department(real_rank, DEPARTMENT_PLANET))
car[name] = rank
department = 1
//VOREStation Edit End
if(real_rank in civilian_positions)
=======
//VOREStation Add End
if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CIVILIAN))
>>>>>>> 24fbd0b... Half-Refactors Jobs (#6762)
civ[name] = rank
department = 1
if(!department && !(name in heads))