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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-09-18 20:34:31 -04:00
committed by GitHub
parent 9e7de62450
commit e62c484dda
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -529,18 +529,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
//If desired, apply equipment. //If desired, apply equipment.
if(equipment) if(equipment)
if(charjob) if(charjob)
<<<<<<< HEAD
job_master.EquipRank(new_character, charjob, 1, announce) job_master.EquipRank(new_character, charjob, 1, announce)
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
=======
job_master.EquipRank(new_character, charjob, 1)
if(new_character.mind) if(new_character.mind)
new_character.mind.assigned_role = charjob new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob) new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
//equip_custom_items(new_character) //VOREStation Removal equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt
>>>>>>> 607d730743... Merge pull request #13738 from Heroman3003/admin-runtimes
//If desired, add records. //If desired, add records.
if(records) if(records)