PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-11 06:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into rad-poisoning

Browse source
This commit is contained in:
Fate-JH 2026-01-05 23:07:05 -05:00 • committed by GitHub
commit 0ae5a46934
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
60 changed files with 1362 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/src/main/resources/overrides/game_objects0.adb.lst
View file

@ -60,10 +60,6 @@ add_property maelstrom equiptime 1000
add_property maelstrom holstertime 1000
add_property magcutter equiptime 250
add_property magcutter holstertime 250
add_property medicalapplicator equiptime 500
add_property medicalapplicator holstertime 500
add_property medicalapplicator firemode0_refiretime 500
add_property medicalapplicator firemode1_refiretime 500
add_property mini_chaingun equiptime 750
add_property mini_chaingun holstertime 750
add_property nano_dispenser equiptime 750
@ -95,7 +91,7 @@ add_property super_staminakit nodrop false
add_property super_staminakit requirement_award0 false
add_property suppressor equiptime 600
add_property suppressor holstertime 600
add_property trek allowed false
add_property trek allowed true
add_property trek equiptime 500
add_property trek holstertime 500
add_property vulture requirement_award0 false