From b7db18f29e0b43407cb9d0b5d97fe4e9f82125dd Mon Sep 17 00:00:00 2001 From: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> Date: Tue, 8 Feb 2022 05:29:28 +0000 Subject: [PATCH] fixes a dumb --- .../modules/interaction_menu/code/interaction_component.dm | 4 +--- .../modules/interaction_menu/code/interaction_datum.dm | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm index c429eed2228..f3e9a86d3c5 100644 --- a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm +++ b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm @@ -23,9 +23,7 @@ interactions = list() for(var/iterating_interaction_id in GLOB.interaction_instances) var/datum/interaction/interaction = GLOB.interaction_instances[iterating_interaction_id] - if(interaction.lewd && !self.client?.prefs?.read_preference(/datum/preference/toggle/erp)) - continue - if(interaction.sexuality != "None" && interaction.sexuality != self.client?.prefs?.read_preference(/datum/preference/choiced/erp_sexuality)) + if(interaction.lewd && !self.client?.prefs?.read_preference(/datum/preference/toggle/erp) || (interaction.sexuality != "" || interaction.sexuality != self.client?.prefs?.read_preference(/datum/preference/choiced/erp_sexuality))) continue interactions.Add(interaction) diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm index 313d8b27620..43088d9406a 100644 --- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm +++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm @@ -49,7 +49,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction) /// What color should the interaction button be? var/color = "blue" /// What sexuality preference do we display for. - var/sexuality = "None" + var/sexuality = "" /datum/interaction/proc/allow_act(mob/living/carbon/human/user, mob/living/carbon/human/target) if(target == user && usage == INTERACTION_OTHER)