From c7041eefcea32e318fdef57cbcab6c0bec9779c6 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sun, 27 Apr 2014 14:40:28 -0600 Subject: [PATCH] New Human Mobs will have the appearance of the client's preferences New human mobs created via Admin Simple Transform, Admin Spawn Antagonist, and Wizard Apprentice functions will take on the appearance of the players' preferences, instead of the boring default Bald, White Male. Also fixes an minor issue with using transfer_to() a new observer mob. --- code/game/gamemodes/antag_spawner.dm | 1 + code/modules/admin/verbs/one_click_antag.dm | 6 +----- code/modules/mob/mob_transformation_simple.dm | 5 ++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index ebe28d02f89..f7632a02844 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -64,6 +64,7 @@ /obj/item/weapon/antag_spawner/contract/spawn_antag(var/client/C, var/turf/T, var/type = "") new /obj/effect/effect/harmless_smoke(T) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) + C.prefs.copy_to(M) M.key = C.key M << "You are the [usr.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals." switch(type) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 63b10dede5b..c225d332a23 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -392,11 +392,7 @@ client/proc/one_click_antag() //First we spawn a dude. var/mob/living/carbon/human/new_character = new(pick(latejoin))//The mob being spawned. - new_character.gender = pick(MALE,FEMALE) - - var/datum/preferences/A = new() - A.copy_to(new_character) - + G_found.client.prefs.copy_to(new_character) ready_dna(new_character) new_character.key = G_found.key diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index a81a46609d1..717109e3e32 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -44,10 +44,13 @@ var/mob/living/carbon/C = src var/mob/living/carbon/D = M D.dna = C.dna + updateappearance(D) else + if(istype(M, /mob/living/carbon/human)) + src.client.prefs.copy_to(M) ready_dna(M) - if(mind) + if(mind && istype(M, /mob/living)) mind.transfer_to(M) else M.key = key