PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-09 05:24:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master-upstream' into llu-2021

Browse source 
# Conflicts:
#	src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
#	src/main/scala/net/psforever/services/galaxy/GalaxyService.scala
#	src/main/scala/net/psforever/services/local/LocalService.scala
#	src/main/scala/net/psforever/services/local/LocalServiceMessage.scala
This commit is contained in:
Mazo 2021-03-31 23:12:59 +01:00
commit 7e1466c898
208 changed files with 7345 additions and 2869 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/resources/application.conf
View file

@ -82,6 +82,15 @@ game {
# Modify the amount of NTU drain per autorepair tick for facility amenities
amenity-autorepair-drain-rate = 0.5
# HART system, shuttles and facilities
hart {
# How long the shuttle is not boarding passengers (going through the motions)
in-flight-duration = 225000
# How long the shuttle allows passengers to board
boarding-duration = 60000
}
new-avatar {
# Starting battle rank
br = 1