Merge pull request #1696 from CHOMPStationBot/upstream-merge-10032

[MIRROR] Adminbus Area Modifications
This commit is contained in:
Nadyr
2021-03-30 04:00:25 -04:00
committed by GitHub
18 changed files with 56297 additions and 864 deletions

View File

@@ -533,6 +533,8 @@ 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)
new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt
//If desired, add records.
@@ -540,7 +542,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
data_core.manifest_inject(new_character)
//A redraw for good measure
new_character.update_icons_all()
new_character.regenerate_icons()
//If we're announcing their arrival
if(announce)