cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update randomverbs.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-30 03:34:45 -04:00
committed by GitHub
parent 337acaa851
commit e22a6d6eab
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/admin/verbs/randomverbs.dm
View File

@@ -527,15 +527,9 @@ 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)
<<<<<<< HEAD
equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt
||||||| parent of 8844a0cb02... Merge pull request #10032 from Novacat/nova-ert
//equip_custom_items(new_character) //VOREStation Removal
=======
new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
//equip_custom_items(new_character) //VOREStation Removal
>>>>>>> 8844a0cb02... Merge pull request #10032 from Novacat/nova-ert
equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt
//If desired, add records.
if(records)