cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 20:27:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adminbus Area Modifications

Browse Source
This commit is contained in:
Chompstation Bot
2021-03-29 17:22:38 +00:00
parent c0fd1e030b
commit 337acaa851
18 changed files with 56310 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+9 -1
View File
@@ -527,14 +527,22 @@ 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
//If desired, add records.
if(records)
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)