diff --git a/config/game_options.txt b/config/game_options.txt index 9dd863aded73..7f4d7895eb3d 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -674,11 +674,8 @@ MICE_ROUNDSTART 5 ## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait! ROUNDSTART_TRAITS -## Uncomment to disable human moods. -DISABLE_HUMAN_MOOD - -## Uncomment to force human moods. Not compatible with DISABLE_HUMAN_MOOD -FORCE_HUMAN_MOOD +## Uncomment to allow selection for human moods. Comment to force moods on +#DISABLE_HUMAN_MOOD ## Enable night shifts ## #ENABLE_NIGHT_SHIFTS diff --git a/yogstation/code/controllers/subsystem/processing/quirks.dm b/yogstation/code/controllers/subsystem/processing/quirks.dm index 133dba28beaa..0962f462fbde 100644 --- a/yogstation/code/controllers/subsystem/processing/quirks.dm +++ b/yogstation/code/controllers/subsystem/processing/quirks.dm @@ -1,6 +1,6 @@ /datum/controller/subsystem/processing/quirks/proc/checkquirks(mob/living/user,client/cli) // Returns true when the player isn't trying to fuckin scum the mood pref stuff to exploit var/mob/living/carbon/human/U = user - U.mood_enabled = CONFIG_GET(flag/force_human_mood) || cli.prefs.read_preference(/datum/preference/toggle/mood_enabled) // Marks whether this player had moods enabled in preferences at the time of spawning (helps prevent exploitation) + U.mood_enabled = !CONFIG_GET(flag/disable_human_mood) || cli.prefs.read_preference(/datum/preference/toggle/mood_enabled) // Marks whether this player had moods enabled in preferences at the time of spawning (helps prevent exploitation) var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (cli.prefs.read_preference(/datum/preference/toggle/mood_enabled))) // If moods are globally enabled, or this guy does indeed have his mood pref set to Enabled