Merge pull request #282 from JimKil3/unholy_aura

Replaces Fundamentally Evil
DopplerShift13 · Dec 17, 2024 · 7ccfc19 · 7ccfc19
2 parents de463bd + b20d3e6
commit 7ccfc19
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 2 deletions.
diff --git a/code/__DEFINES/~doppler_defines/traits/declarations.dm b/code/__DEFINES/~doppler_defines/traits/declarations.dm
@@ -1,2 +1,5 @@
 /// The trait that determines if someone has the system shock quirk.
 #define TRAIT_SYSTEM_SHOCK "trait_system_shock"
+
+/// The trait given to people with bad vibes.
+#define TRAIT_BAD_VIBES "trait_bad_vibes"
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
@@ -587,6 +587,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_LEFT_EYE_SCAR" = TRAIT_LEFT_EYE_SCAR,
 		"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
 		"TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, // DOPPLER EDIT ADDITION
+		"TRAIT_BAD_VIBES" = TRAIT_BAD_VIBES, // DOPPLER EDIT ADDITION
 	),
 	/obj/item = list(
 		"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,

diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm
@@ -333,7 +333,8 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_IGNORE_FIRE_PROTECTION" = TRAIT_IGNORE_FIRE_PROTECTION,
 		"TRAIT_LEFT_EYE_SCAR" = TRAIT_LEFT_EYE_SCAR,
 		"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
-		"TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, // DOPPLER EDIT ADDITION 
+		"TRAIT_SYSTEM_SHOCK" = TRAIT_SYSTEM_SHOCK, // DOPPLER EDIT ADDITION
+		"TRAIT_BAD_VIBES" = TRAIT_BAD_VIBES, // DOPPLER EDIT ADDITION
 	),
 	/obj/item = list(
 		"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,

diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
@@ -26,7 +26,8 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
 	list(/datum/quirk/photophobia, /datum/quirk/nyctophobia),
 	list(/datum/quirk/item_quirk/settler, /datum/quirk/freerunning),
 	list(/datum/quirk/numb, /datum/quirk/selfaware),
-	list(/datum/quirk/empath, /datum/quirk/evil),
+	list(/datum/quirk/empath, /datum/quirk/bad_vibes), //DOPPLER EDIT ADDITION - Bad Vibes & Unholy Aura
+	list(/datum/quirk/item_quirk/spiritual, /datum/quirk/unholy), //DOPPLER EDIT ADDITION END
 ))
 
 GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist())

diff --git a/code/datums/quirks/neutral_quirks/evil.dm b/code/datums/quirks/neutral_quirks/evil.dm
@@ -1,3 +1,4 @@
+/* DOPPLER EDIT REMOVAL - Fundamentally Evil replaced with Unholy Aura and Bad Vibes
 /datum/quirk/evil
 	name = "Fundamentally Evil"
 	desc = "Where you would have a soul is but an ink-black void. While you are committed to maintaining your social standing, \
@@ -10,3 +11,4 @@
 	lose_text = span_notice("You suddenly care more about others and their needs.")
 	medical_record_text = "Patient has passed all our social fitness tests with flying colours, but had trouble on the empathy tests."
 	mail_goodies = list(/obj/item/food/grown/citrus/lemon)
+*/
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
@@ -228,13 +228,27 @@
 					. += "[t_He] [t_is] flushed and wheezing."
 				if (bodytemperature < dna.species.bodytemp_cold_damage_limit)
 					. += "[t_He] [t_is] shivering."
+				/* DOPPLER EDIT REMOVAL - Fundamentally Evil
 				if(HAS_TRAIT(src, TRAIT_EVIL))
 					. += "[t_His] eyes radiate with a unfeeling, cold detachment. There is nothing but darkness within [t_his] soul."
 					if(living_user.mind?.holy_role >= HOLY_ROLE_PRIEST)
 						. += span_warning("PERFECT FOR SMITING!!")
 					else
 						living_user.add_mood_event("encountered_evil", /datum/mood_event/encountered_evil)
 						living_user.set_jitter_if_lower(15 SECONDS)
+				*/
+				// DOPPLER EDIT ADDITION - Unholy Aura & Bad Vibes
+				if(HAS_TRAIT(src, TRAIT_EVIL) && living_user.mind?.holy_role >= HOLY_ROLE_PRIEST)
+					. += span_warning("[t_He] [t_is] cloaked in a miasma of unholy energy!")
+
+				if(HAS_TRAIT(src, TRAIT_BAD_VIBES))
+					. += span_warning("[t_He] give[p_s()] off an unsettling aura.")
+					living_user.add_mood_event("bad_vibes", /datum/mood_event/bad_vibes)
+
+			if(HAS_TRAIT(user, TRAIT_EVIL) && (mind?.holy_role || HAS_TRAIT(src, TRAIT_SPIRITUAL)))
+				. += span_warning("[t_He] shimmer[p_s()] with radiant protection.")
+				living_user.add_mood_event("holy_figure", /datum/mood_event/holy_figure)
+			// DOPPLER EDIT ADDITION END
 
 			if(HAS_TRAIT(user, TRAIT_SPIRITUAL) && mind?.holy_role)
 				. += "[t_He] [t_has] a holy aura about [t_him]."
@@ -592,4 +606,10 @@
 		if(undershirt.has_sensor == BROKEN_SENSORS)
 			. += list(span_notice("The [undershirt]'s medical sensors are sparking."))
 
+	// DOPPLER EDIT ADDITION BEGIN - working scar examine..?
+	for(var/datum/scar/scar in all_scars)
+		if(scar.is_visible(user))
+			. += scar.get_examine_description(user)
+	// DOPPLER EDIT ADDITION END
+
 #undef ADD_NEWLINE_IF_NECESSARY
diff --git a/modular_doppler/modular_quirks/evil_replacements/bad_vibes.dm b/modular_doppler/modular_quirks/evil_replacements/bad_vibes.dm
@@ -0,0 +1,15 @@
+/datum/quirk/bad_vibes
+	name = "Bad Vibes"
+	desc = "By a quirk of your personality or exposure to too many horrible sights, you give off a bad aura which affects \
+			empaths and anyone else who looks too closely."
+	icon = FA_ICON_HAND_MIDDLE_FINGER
+	value = 0
+	mob_trait = TRAIT_BAD_VIBES
+	gain_text = span_notice("You give off a negative aura.")
+	lose_text = span_notice("You try to be more approachable.")
+	medical_record_text = "Patient scared away a nurse prior to physical examination."
+
+/datum/mood_event/bad_vibes
+	description = "Some people truly disturb me... What could happen to make someone like that?"
+	mood_change = -4
+	timeout = 1 MINUTES
diff --git a/modular_doppler/modular_quirks/evil_replacements/unholy_aura.dm b/modular_doppler/modular_quirks/evil_replacements/unholy_aura.dm
@@ -0,0 +1,15 @@
+/datum/quirk/unholy
+	name = "Unholy Aura"
+	desc = "Whether it's as a punishment for your actions or due to the circumstances of your birth, you've been cursed by \
+			whatever dieties take an interest in this sector. You have a harder time interacting with holy figures."
+	icon = FA_ICON_SMOG
+	value = -2
+	mob_trait = TRAIT_EVIL
+	gain_text = span_warning("A dispassionate gaze from on high weighs on you.")
+	lose_text = span_notice("The deities' gaze turns away.")
+	medical_record_text = "Patient has a strong aversion to religious figures."
+
+/datum/mood_event/holy_figure
+	description = "Holy people are anathema to me. I must be more careful..."
+	mood_change = -4
+	timeout = 1 MINUTES
diff --git a/tgstation.dme b/tgstation.dme
@@ -7084,6 +7084,8 @@
 #include "modular_doppler\modular_quirks\entombed\code\entombed.dm"
 #include "modular_doppler\modular_quirks\entombed\code\entombed_alt_actions.dm"
 #include "modular_doppler\modular_quirks\entombed\code\entombed_mod.dm"
+#include "modular_doppler\modular_quirks\evil_replacements\bad_vibes.dm"
+#include "modular_doppler\modular_quirks\evil_replacements\unholy_aura.dm"
 #include "modular_doppler\modular_quirks\excitable\excitable.dm"
 #include "modular_doppler\modular_quirks\fragility\code\fragile.dm"
 #include "modular_doppler\modular_quirks\hardened_soles\hardened_soles.dm"