Psychopathic&Bad Touch added

code/__DEFINES/{dripstation_defines}/traits.dm

@@ -0,0 +1,3 @@
+#define TRAIT_PSYCHOPATHIC		"psychopathic"
+#define TRAIT_APATHETIC			"apathetic"
+#define TRAIT_BADTOUCH			"bad_touch"

code/controllers/subsystem/processing/quirks.dm

@@ -17,9 +17,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 	if(!quirks.len)
 		SetupQuirks()
 
+	//Psychopathic, Bad Touch dripstation edit
 	quirk_blacklist = list(
 		list("Blind","Nearsighted"),
-		list("Jolly","Depression","Apathetic","Hypersensitive"),
+		list("Jolly","Depression","Apathetic","Hypersensitive","Psychopathic"),
+		list("Bad Touch", "Friendly"),
 		list("Ageusia","Vegetarian","Deviant Tastes"),
 		list("Ananas Affinity","Ananas Aversion"),
 		list("Alcohol Tolerance","Light Drinker"),

code/modules/mob/living/carbon/carbon_defense.dm

@@ -510,7 +510,13 @@
 			adjust_wet_stacks(averagestacks)
 			M.adjust_wet_stacks(-averagestacks)
 			to_chat(src, span_notice("The hug [M] gave you was a little wet..."))
+		if(HAS_TRAIT(src, TRAIT_BADTOUCH))	//dripstation edit
+			to_chat(M, span_warning("[src] looks visibly upset as you hug [p_them()]."))	//dripstation edit
+		if(HAS_TRAIT(src, TRAIT_PSYCHOPATHIC) || HAS_TRAIT(src, TRAIT_APATHETIC))	//dripstation edit
+			to_chat(M, span_warning("[src] have no visual reaction to your hug."))	//dripstation edit
 
+	SEND_SIGNAL(src, COMSIG_CARBON_HELP_ACT, M)	//dripstation edit
+	SEND_SIGNAL(M, COMSIG_CARBON_HELPED, src)	//dripstation edit
 	adjust_status_effects_on_shake_up()
 
 	adjustStaminaLoss(-10) //dripstation edit, now shakes and hugs recovers stamina again

code/modules/mob/living/living.dm

@@ -273,6 +273,7 @@
 	if(ismob(AM))
 		var/mob/M = AM
 
+		SEND_SIGNAL(M, COMSIG_LIVING_GET_PULLED, src)	//dripstation edit
 		log_combat(src, M, "grabbed", addition="passive grab")
 		if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER)))
 			visible_message(span_warning("[src] has grabbed [M] passively!"))

modular_dripstation/code/datums/component/mood.dm

@@ -36,6 +36,13 @@
 		if(prob(0.05))
 			add_event(null, "jolly", /datum/mood_event/jolly)
 			clear_event(null, "depression")
+	if(HAS_TRAIT(owner, TRAIT_PSYCHOPATHIC))
+		if(prob(0.005))
+			add_event(null, "depression", /datum/mood_event/depression_moderate)
+			clear_event(null, "jolly")
+		if(prob(0.005))
+			add_event(null, "jolly", /datum/mood_event/jolly)
+			clear_event(null, "depression")
 
 	HandleNutrition(owner)
 

modular_dripstation/code/datums/mood_events/generic_negative_events.dm

@@ -2,4 +2,14 @@
 	mood_change = 0		//F THIS RIMWORLD REFERENCE
 
 /datum/mood_event/surgery
-	timeout = 5 MINUTES
+	timeout = 5 MINUTES
+
+/datum/mood_event/bad_touch
+	description = "I don't like when people touch me."
+	mood_change = -3
+	timeout = 4 MINUTES
+
+/datum/mood_event/very_bad_touch
+	description = "I really don't like when people touch me."
+	mood_change = -5
+	timeout = 4 MINUTES

modular_dripstation/code/datums/mood_events/generic_positive_events.dm

@@ -1,6 +1,10 @@
 /datum/mood_event/focused
 	mood_change = 10	//Used for syndies, nukeops etc so they can focus on their goals
 
+/datum/mood_event/slaughter
+	description ="<span class='nicegreen'>These pitiful NanoTrasen scam will drink vacuum! Slaughter... THEM... ALL!!</span>\n"
+	mood_change = 15
+
 /datum/mood_event/heretics
 	mood_change = 8
 
@@ -18,4 +22,9 @@
 /datum/mood_event/sacrifice_heretic
 	description ="<span class='nicegreen'>Your patrons are pleased with this offering!</span>\n"
 	mood_change = 5
-	timeout = 3 MINUTES
+	timeout = 3 MINUTES
+
+/datum/mood_event/jolly_moderate
+	description = "<span class='nicegreen'>That was a really funny joke that my inner self told me!</span>\n"
+	mood_change = 9
+	timeout = 2 MINUTES

modular_dripstation/code/datums/traits/negative.dm

@@ -0,0 +1,30 @@
+/datum/quirk/bad_touch
+	name = "Bad Touch"
+	desc = "You don't like hugs. You'd really prefer if people just left you alone."
+	icon = "tg-bad-touch"
+	mob_trait = TRAIT_BADTOUCH
+	value = -1
+	gain_text = span_danger("You just want people to leave you alone.")
+	lose_text = span_notice("You could use a big hug.")
+	medical_record_text = "Patient has disdain for being touched. Potentially has undiagnosed haphephobia."
+	mood_quirk = TRUE
+
+/datum/quirk/bad_touch/add(client/client_source)
+	RegisterSignals(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT), PROC_REF(uncomfortable_touch))
+
+/datum/quirk/bad_touch/remove()
+	UnregisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT))
+
+/// Causes a negative moodlet to our quirk holder on signal
+/datum/quirk/bad_touch/proc/uncomfortable_touch(datum/source)
+	SIGNAL_HANDLER
+
+	if(quirk_holder.stat == DEAD)
+		return
+
+	new /obj/effect/temp_visual/annoyed(quirk_holder.loc)
+	var/datum/component/mood/mob_mood = quirk_holder.GetComponent(/datum/component/mood)
+	if(mob_mood.sanity <= SANITY_NEUTRAL)
+		SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "bad_touch", /datum/mood_event/very_bad_touch)
+	else
+		SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "bad_touch", /datum/mood_event/bad_touch)

modular_dripstation/code/datums/traits/positive.dm

@@ -0,0 +1,24 @@
+/datum/quirk/psychopathic
+	name = "Psychopathic"
+	desc = "You often hear to yourself: Hey, secy, how many animals have you killed as a child?"
+	icon = "meh"
+	value = 5
+	mob_trait = TRAIT_PSYCHOPATHIC
+	mood_quirk = TRUE
+	gain_text = span_danger("I don`t mind if they all die.")
+	lose_text = span_notice("Okey, time to touch some grass.")
+	medical_record_text = "The patient has a psychopathic personality disorder. It is normal for him to react socially distantly to certain events."
+
+/datum/quirk/psychopathic/add()
+	var/datum/component/mood/mood = quirk_holder.GetComponent(/datum/component/mood)
+	if(mood)
+		mood.mood_modifier -= 0.4
+
+/datum/quirk/psychopathic/remove()
+	if(quirk_holder)
+		var/datum/component/mood/mood = quirk_holder.GetComponent(/datum/component/mood)
+		if(mood)
+			mood.mood_modifier += 0.4
+
+/datum/quirk/apathetic
+	mob_trait = TRAIT_APATHETIC

modular_dripstation/code/game/effects/temporary_visuals/misc.dm

@@ -0,0 +1,5 @@
+/obj/effect/temp_visual/annoyed
+	name = "annoyed"
+	icon = 'modular_dripstation/icons/effects/effects.dmi'
+	icon_state = "annoyed"
+	duration = 25

modular_dripstation/includes.dm

@@ -10,6 +10,9 @@
 #include "code\datums\reagent\leadacetate.dm"
 #include "code\datums\strong_pull.dm"
 #include "code\datums\keybinding\communication.dm"
+#include "code\datums\traits\negative.dm"
+#include "code\datums\traits\positive.dm"
+#include "code\game\effects\temporary_visuals\misc.dm"
 #include "code\game\effects\effects_foam.dm"
 #include "code\game\mecha\cargo_hauler.dm"
 #include "code\game\objects\items\bepis_items\boomerang.dm"

yogstation.dme

@@ -188,6 +188,7 @@
 #include "code\__DEFINES\{dripstation_defines}\blackmarket.dm"
 #include "code\__DEFINES\{dripstation_defines}\cargo.dm"
 #include "code\__DEFINES\{dripstation_defines}\dcs\signals\signals_transform.dm"
+#include "code\__DEFINES\{dripstation_defines}\traits.dm"
 #include "code\__DEFINES\{yogs_defines}\admin.dm"
 #include "code\__DEFINES\{yogs_defines}\antagonists.dm"
 #include "code\__DEFINES\{yogs_defines}\atmospherics.dm"