diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index b013f5f929..1799eca698 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -512,7 +512,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car job_preferences -= j all_quirks = SANITIZE_LIST(all_quirks) - + for(var/V in all_quirks) // quirk migration switch(V) if("Acute hepatic pharmacokinesis") @@ -520,13 +520,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car DISABLE_BITFIELD(cit_toggles, BREAST_ENLARGEMENT) ENABLE_BITFIELD(cit_toggles,FORCED_FEM) ENABLE_BITFIELD(cit_toggles,FORCED_MASC) - cli.prefs.all_quirks -= V + all_quirks -= V if("Crocin Immunity") ENABLE_BITFIELD(cit_toggles,NO_APHRO) - cli.prefs.all_quirks -= V + all_quirks -= V if("Buns of Steel") ENABLE_BITFIELD(cit_toggles,NO_ASS_SLAP) - cli.prefs.all_quirks -= V + all_quirks -= V cit_character_pref_load(S) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 17d6d438d5..fdd89549e5 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1586,7 +1586,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) user.do_attack_animation(target, ATTACK_EFFECT_FACE_SLAP) user.adjustStaminaLossBuffered(3) return FALSE - else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin) && !(target.client?.prefs.cit_toggles & NO_ASS_SLAP))) + else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin) && !(target.client?.prefs.cit_toggles & NO_ASS_SLAP)) user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP) user.adjustStaminaLossBuffered(3) playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)