Merge remote-tracking branch 'ParadiseSS13/master' into id_computer_demote_terminate_freejob

This commit is contained in:
Kyep
2020-08-01 17:39:30 -07:00
1235 changed files with 71688 additions and 375044 deletions
@@ -35,7 +35,8 @@
/datum/job/ntnavyofficer,
/datum/job/ntspecops,
/datum/job/civilian,
/datum/job/syndicateofficer
/datum/job/syndicateofficer,
/datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work
)
//The scaling factor of max total positions in relation to the total amount of people on board the station in %