From 3fb221e5e299846cf3856b892a14fbe452c09f58 Mon Sep 17 00:00:00 2001 From: Jacquerel Date: Mon, 1 Aug 2022 21:32:17 +0100 Subject: [PATCH] [NO GBP] Fixes cyborg existentialism upon encountering syndicate posters (#68913) Renames proc and inverts return. --- .../modules/antagonists/traitor/components/demoraliser.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/traitor/components/demoraliser.dm b/code/modules/antagonists/traitor/components/demoraliser.dm index 88728cde60a..b1a36e97a2a 100644 --- a/code/modules/antagonists/traitor/components/demoraliser.dm +++ b/code/modules/antagonists/traitor/components/demoraliser.dm @@ -44,7 +44,7 @@ // If you're not conscious you're too busy or dead to look at propaganda if (viewer.stat != CONSCIOUS) return - if (was_demoralised(viewer)) + if (!should_demoralise(viewer)) return if (is_special_character(viewer)) @@ -60,17 +60,17 @@ SEND_SIGNAL(host, COMSIG_DEMORALISING_EVENT, viewer.mind) /** - * Returns true if the viewer already has been given feelings, false if they haven't. + * Returns true if user is capable of experiencing moods and doesn't already have the one relevant to this datum, false otherwise. * * Arguments * * viewer - Whoever just saw the parent. */ -/datum/proximity_monitor/advanced/demoraliser/proc/was_demoralised(mob/living/viewer) +/datum/proximity_monitor/advanced/demoraliser/proc/should_demoralise(mob/living/viewer) var/datum/component/mood/mood = viewer.GetComponent(/datum/component/mood) if (!mood) return FALSE - return mood.has_mood_of_category(moods.mood_category) + return !mood.has_mood_of_category(moods.mood_category) /// Mood application categories for this objective /// Used to reduce duplicate code for applying moods to players based on their state