Merge remote-tracking branch 'upstream/release'

This commit is contained in:
Hawk_v3
2019-09-16 14:57:39 +01:00
91 changed files with 538 additions and 2252 deletions

View File

@@ -491,7 +491,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(equipment)
if(charjob)
job_master.EquipRank(new_character, charjob, 1)
equip_custom_items(new_character)
//equip_custom_items(new_character) //VOREStation Removal
//If desired, add records.
if(records)