cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Saycode/language/species port from Bay""

Browse Source 
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
This commit is contained in:
Markolie
2015-02-20 17:46:35 +01:00
parent f27b2dcd9b
commit d8d1670b68
109 changed files with 2955 additions and 2349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+9 -31
View File
@@ -444,46 +444,22 @@
proc/create_character()
spawning = 1
close_spawn_windows()
var/mob/living/carbon/human/new_character
var/datum/species/chosen_species
if(client.prefs.species)
chosen_species = all_species[client.prefs.species]
if(chosen_species)
// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
if(is_species_whitelisted(chosen_species) || has_admin_rights())
switch(chosen_species.name)
if("Slime People")
new_character = new /mob/living/carbon/human/slime(loc)
if("Tajaran")
new_character = new /mob/living/carbon/human/tajaran(loc)
if("Unathi")
new_character = new /mob/living/carbon/human/unathi(loc)
if("Skrell")
new_character = new /mob/living/carbon/human/skrell(loc)
if("Diona")
new_character = new /mob/living/carbon/human/diona(loc)
if("Vox")
new_character = new /mob/living/carbon/human/vox(loc)
if("Vox Armalis")
new_character = new /mob/living/carbon/human/voxarmalis(loc)
if("Kidan")
new_character = new /mob/living/carbon/human/kidan(loc)
if("Grey")
new_character = new /mob/living/carbon/human/grey(loc)
if("Machine")
new_character = new /mob/living/carbon/human/machine(loc)
if("Plasmaman")
new_character = new /mob/living/carbon/human/plasma(loc)
if("Human")
new_character = new /mob/living/carbon/human/human(loc)
// new_character.set_species(client.prefs.species)
if(chosen_species.language)
new_character.add_language(chosen_species.language)
else
new_character = new /mob/living/carbon/human(loc)
new_character = new(loc, client.prefs.species)
if(!new_character)
new_character = new(loc)
new_character.lastarea = get_area(loc)
var/datum/language/chosen_language
if(client.prefs.language)
chosen_language = all_languages[client.prefs.language]
@@ -529,6 +505,8 @@
if(client.prefs.disabilities & DISABILITY_FLAG_DEAF)
new_character.dna.SetSEState(DEAFBLOCK,1,1)
new_character.sdisabilities |= DEAF
chosen_species.handle_dna(new_character)
domutcheck(new_character)
new_character.dna.UpdateSE()