From 687f3c97c34ddd22c63757ad8a67c869ebb8f0de Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Thu, 28 Mar 2019 11:49:44 -0700 Subject: [PATCH] Fix being sent back to lobby not allowing changing quirks (#43319) --- code/controllers/subsystem/processing/quirks.dm | 8 +------- code/modules/client/preferences.dm | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 3ddca57b341..5bf8d59224d 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -30,11 +30,5 @@ PROCESSING_SUBSYSTEM_DEF(quirks) quirk_points[initial(T.name)] = initial(T.value) /datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects) - GenerateQuirks(cli) - for(var/V in cli.prefs.character_quirks) + for(var/V in cli.prefs.all_quirks) user.add_quirk(V, spawn_effects) - -/datum/controller/subsystem/processing/quirks/proc/GenerateQuirks(client/user) - if(user.prefs.character_quirks.len) - return - user.prefs.character_quirks = user.prefs.all_quirks diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 5f902501f25..8159bdb2463 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -75,7 +75,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/negative_quirks = list() var/list/neutral_quirks = list() var/list/all_quirks = list() - var/list/character_quirks = list() //Jobs, uses bitflags var/job_civilian_high = 0