cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 06:04:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict, wipe map changes

Browse Source
This commit is contained in:
Kyep
2019-01-03 14:39:41 -08:00
parent 702f4db165 460e9b3119
commit d488195799
286 changed files with 4882 additions and 2538 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/command/card.dm
+2 -1
View File
@@ -34,7 +34,8 @@
/datum/job/chaplain,
/datum/job/ntnavyofficer,
/datum/job/ntspecops,
/datum/job/civilian
/datum/job/civilian,
/datum/job/syndicateofficer
)
//The scaling factor of max total positions in relation to the total amount of people on board the station in %