Merge branch 'master' into dynamicport

2021-09-19 17:59:09 -04:00
parent 0b5a7c9759 6e30018618
commit 13323d2597
91 changed files with 6778 additions and 2292 deletions
@@ -11,6 +11,8 @@ Chief Medical Officer=1,1

 Assistant=-1,-1

+Prisoner=0,2
+
 Quartermaster=1,1
 Cargo Technician=3,2
 Shaft Miner=3,3