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

Update randomverbs.dm

Browse Source
This commit is contained in:
Razgriz
2021-02-23 03:25:13 -07:00
committed by GitHub
parent 32312e22b6
commit 61192181d0
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -515,17 +515,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(new_character.mind) if(new_character.mind)
new_character.mind.loaded_from_ckey = picked_ckey new_character.mind.loaded_from_ckey = picked_ckey
new_character.mind.loaded_from_slot = picked_slot new_character.mind.loaded_from_slot = picked_slot
<<<<<<< HEAD
//VOREStation Add End
||||||| parent of 278c3eaa3f... Merge pull request #9761 from VOREStation/upstream-merge-7891
for(var/lang in picked_client.prefs.alternate_languages)
var/datum/language/chosen_language = GLOB.all_languages[lang]
if(chosen_language)
if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
new_character.add_language(lang)
//VOREStation Add End
=======
//VOREStation Add End //VOREStation Add End
for(var/lang in picked_client.prefs.alternate_languages) for(var/lang in picked_client.prefs.alternate_languages)
@@ -533,7 +522,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(chosen_language) if(chosen_language)
if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs))) if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
new_character.add_language(lang) new_character.add_language(lang)
>>>>>>> 278c3eaa3f... Merge pull request #9761 from VOREStation/upstream-merge-7891
//If desired, apply equipment. //If desired, apply equipment.
if(equipment) if(equipment)