Adds bloodlust and harm-averse quirks (#339)

* Adds blood lust and harm-averse quirks

* makes harm-averse and bloodlust also apply when attacking with items

* guh

* guh v2

Author: Djiq

code/controllers/subsystem/processing/quirks.dm

@@ -28,7 +28,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 							list("Alcohol Tolerance","Light Drinker"), \
 							list("Clown Fan","Mime Fan"), \
 							list("Bad Touch", "Friendly"), \
-							list("Extrovert", "Introvert"))
+							list("Extrovert", "Introvert"), \
+							list("Bloodlust", "Harm-averse"))
 	return ..()
 
 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()

code/datums/quirks/good.dm

@@ -208,3 +208,31 @@
 	mob_trait = TRAIT_VORACIOUS
 	gain_text = "<span class='notice'>You feel HONGRY.</span>"
 	lose_text = "<span class='danger'>You no longer feel HONGRY.</span>"
+
+/datum/quirk/bloodlust
+	name = "Bloodlust"
+	desc = "Beating people up is fun!"
+	value = 6
+	gain_text = "<span class='notice'> You feel energized by violence.</span>"
+	lose_text = "<span class='danger'> You no longer feel good about hurting others.</span>"
+
+/datum/quirk/bloodlust/add()
+	. = ..()
+	RegisterSignal(quirk_holder,COMSIG_MOB_ATTACK_HAND,.proc/apply_bloodlust_hand)
+	RegisterSignal(quirk_holder,COMSIG_MOB_ITEM_ATTACK,.proc/apply_bloodlust_item)
+
+/datum/quirk/bloodlust/remove()
+	. = ..()
+	UnregisterSignal(quirk_holder,COMSIG_MOB_ATTACK_HAND)
+	UnregisterSignal(quirk_holder,COMSIG_MOB_ITEM_ATTACK)
+
+/datum/quirk/bloodlust/proc/apply_bloodlust_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
+	if(!M.istate.harm)
+		return
+	M.adjustStaminaLoss(-7.5)
+
+/datum/quirk/bloodlust/proc/apply_bloodlust_item(obj/item/I, mob/living/carbon/human/target, mob/living/carbon/human/user, params)
+	if(!user.istate.harm)
+		return
+	user.adjustStaminaLoss(-7.5)
+

code/datums/quirks/negative.dm

@@ -794,3 +794,31 @@
 		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)
+
+/datum/quirk/harm_averse
+	name = "Harm-averse"
+	desc = "You're scared to beat up people"
+	value = -6
+	gain_text = "<span class='notice'> You feel afraid of punch-fights.</span>"
+	lose_text = "<span class='danger'> You feel neutral towards beating people up.</span>"
+
+/datum/quirk/harm_averse/add()
+	. = ..()
+	RegisterSignal(quirk_holder,COMSIG_MOB_ATTACK_HAND,.proc/apply_harm_averse_hand)
+	RegisterSignal(quirk_holder,COMSIG_MOB_ITEM_ATTACK,.proc/apply_harm_averse_item)
+
+
+/datum/quirk/harm_averse/remove()
+	. = ..()
+	UnregisterSignal(quirk_holder,COMSIG_MOB_ATTACK_HAND)
+	UnregisterSignal(quirk_holder,COMSIG_MOB_ITEM_ATTACK)
+
+/datum/quirk/harm_averse/proc/apply_harm_averse_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
+	if(!M.istate.harm)
+		return
+	M.adjustStaminaLoss(7.5)
+
+/datum/quirk/harm_averse/proc/apply_harm_averse_item(obj/item/I, mob/living/carbon/human/target, mob/living/carbon/human/user, params)
+	if(!user.istate.harm)
+		return
+	user.adjustStaminaLoss(7.5)