From 435ca89134fe31ef85f1626369b86ab5cdf3bff3 Mon Sep 17 00:00:00 2001 From: Fermi Date: Wed, 22 May 2019 19:24:25 +0100 Subject: [PATCH] New traits. --- .../code/datums/status_effects/chems.dm | 2 +- .../code/datums/traits/negative.dm | 22 +++++++++++++++++++ .../code/datums/traits/positive.dm | 12 ++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 modular_citadel/code/datums/traits/negative.dm create mode 100644 modular_citadel/code/datums/traits/positive.dm diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 6598904afb..7753fd9eab 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -221,7 +221,7 @@ //Might need to add redirect component for listening too. var/obj/item/organ/brain/B = M.getorganslot(ORGAN_SLOT_BRAIN) //It's their brain! mental_capacity = 500 - B.get_brain_damage() - var/message = "[(owner.lewd?"I am a good pet for [enthrallGender].":"I find enjoyment in fulfilling the requests of [master] and I am appreciative of being in this position currently with no desire for this to change.")]" + var/message = "[(owner.lewd?"I am a good pet for [enthrallGender].":"[master] is a really inspirational person!")]" SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "enthrall", /datum/mood_event/enthrall, message) to_chat(owner, "You feel inexplicably drawn towards [master], their words having a demonstrable effect on you. It seems the closer you are to them, the stronger the effect is. However you aren't fully swayed yet and can still repeatedly resist their effects! (Mash resist to fight back!!)") return ..() diff --git a/modular_citadel/code/datums/traits/negative.dm b/modular_citadel/code/datums/traits/negative.dm new file mode 100644 index 0000000000..5faea82318 --- /dev/null +++ b/modular_citadel/code/datums/traits/negative.dm @@ -0,0 +1,22 @@ +// Citadel-specific Negative Traits + +/datum/quirk/Hypno + name = "Hypnotherapy user" + desc = "You had hypnotherapy right before your shift, you're not sure it had any effects, though." + value = -1 //I mean, it can be a really bad trait to have, but on the other hand, some people want it? + gain_text = "You really think the hypnotherapy helped you out." + //lose_text = "You forget about the hypnotherapy you had, or did you even have it?" + +/datum/quirk/Hypno/add() + //You caught me, it's not actually based off a trigger, stop spoiling the effect! Code diving ruins the magic! + addtimer(CALLBACK(quirk_holder, datum/quirk/Hypno, quirk_holder), rand(12000, 36000)) + +datum/quirk/Hypno/proc/triggered(quirk_holder)//I figured I might as well make a trait of code I added. + var/mob/living/carbon/human/H = quirk_holder + var/list/seen = viewers(8, get_turf(H)) + if(LAZYLEN(seen) == 0) + H.to_chat("That object accidentally sets off your implanted trigger, sending you into a hypnotic daze!") + else + H.to_chat("[pick(seen)] accidentally sets off your implanted trigger, sending you into a hypnotic daze!") + H.apply_status_effect(/datum/status_effect/trance, 200, TRUE) + qdel(src) diff --git a/modular_citadel/code/datums/traits/positive.dm b/modular_citadel/code/datums/traits/positive.dm new file mode 100644 index 0000000000..fc86e91b68 --- /dev/null +++ b/modular_citadel/code/datums/traits/positive.dm @@ -0,0 +1,12 @@ +// Citadel-specific Positive Traits + +/datum/quirk/BloodPressure + name = "Synthetic blood" + desc = "You've got a new form of synthetic blood that increases the total blood volume inside of you!" + value = 1 + gain_text = "You feel full of blood!" + lose_text = "You feel like your blood pressure went down." + +/datum/quirk/BloodPressure/add() + var/mob/living/M = quirk_holder + M.blood_ratio = 1.2