Merge branch 'master' of git://github.com/Abi79/tgstation13-git

Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
This commit is contained in:
Miniature
2011-12-03 19:28:10 +10:30
179 changed files with 8711 additions and 8146 deletions
+7 -1
View File
@@ -335,7 +335,13 @@
close_spawn_windows()
preferences.copy_to(new_character)
if(ticker.random_players)
new_character.gender = pick(MALE, MALE, FEMALE)
preferences.randomize_name()
preferences.randomize_appearance_for(new_character)
else
preferences.copy_to(new_character)
new_character.dna.ready_dna(new_character)
if(mind)
mind.transfer_to(new_character)
@@ -637,7 +637,6 @@ datum/preferences
ShowChoices(user)
proc/copy_to(mob/living/carbon/human/character, safety = 0)
if(be_random_name)
randomize_name()
@@ -12,7 +12,7 @@ datum/preferences
randomize_facial()
randomize_hair_color("facial")
randomize_eyes_color()
underwear = pick(0,1)
underwear = 1
b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-")
age = rand(19,35)
copy_to(H,1)