Fixes the ghost role spawner spawning a naked human while waiting on you to decide whether you want to use the character from your preferences or not (#17319)

Fixes the ghost role spawner spawning a naked human while waiting on user input
This commit is contained in:
GoldenAlpharex
2022-11-15 06:44:17 -08:00
committed by GitHub
parent 8eb0cde34b
commit a238c0a6fb
3 changed files with 26 additions and 16 deletions
-16
View File
@@ -189,22 +189,6 @@
/obj/effect/mob_spawn/ghost_role/special(mob/living/spawned_mob, mob/mob_possessor)
. = ..()
// SKYRAT EDIT ADDITION
//if we can load our own appearance and its not restricted, try
if(!random_appearance && mob_possessor?.client && ishuman(spawned_mob))
//if we have gotten to this point, they have already waived their species pref.-- they were told they need to use the specific species already
if((restricted_species && (mob_possessor?.client?.prefs?.read_preference(/datum/preference/choiced/species) in restricted_species)) || !restricted_species)
var/appearance_choice = tgui_alert(mob_possessor, "Use currently loaded character preferences?", "Appearance Type", list("Yes", "No"))
if(appearance_choice == "Yes")
var/mob/living/carbon/human/spawned_human = spawned_mob
mob_possessor?.client?.prefs?.safe_transfer_prefs_to(spawned_human)
spawned_human.dna.update_dna_identity()
if(quirks_enabled)
SSquirks.AssignQuirks(spawned_human, mob_possessor.client)
if(loadout_enabled)
spawned_human.equip_outfit_and_loadout(outfit, mob_possessor.client.prefs)
// SKYRAT EDIT END
if(mob_possessor)
spawned_mob.ckey = mob_possessor.ckey
if(show_flavor)