Merge branch 'master' into SpaceRuins

config/config.txt

@@ -184,6 +184,15 @@ VOTE_DELAY 6000
 ## time period (deciseconds) which voting session will last (default 1 minute)
 VOTE_PERIOD 600
 
+## autovote initial delay (deciseconds) before first automatic transfer vote call (default 120 minutes)
+VOTE_AUTOTRANSFER_INITIAL 72000
+
+## autovote delay (deciseconds) before sequential automatic transfer votes are called (default 30 minutes)
+VOTE_AUTOTRANSFER_INTERVAL 18000
+
+## autovote maximum votes until automatic transfer call (default 4)
+VOTE_AUTOTRANSFER_MAXIMUM 4
+
 ## prevents dead players from voting or starting votes
 # NO_DEAD_VOTE
 

config/jobs.txt

@@ -31,6 +31,7 @@ Station Engineer=5,5
 Atmospheric Technician=3,2
 
 Medical Doctor=5,3
+Paramedic=2,2
 Chemist=2,2
 Geneticist=2,2
 Virologist=1,1
@@ -43,4 +44,4 @@ Detective=1,1
 Security Officer=5,5
 
 AI=0,1
-Cyborg=0,1
+Cyborg=0,1