From c394191f0c81f03abac6e90aa87ef65890c604bc Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 9 Sep 2020 08:16:13 +0200
Subject: [PATCH] [MIRROR] Makes highlander turn off pacifism (#703)

* Makes highlander turn off pacifism (#53504)

Makes gaining the highlander antagonist status turn disable the pacifism quirk. It will re-enable if you lose the status, although that doesn't happen often.

* Makes highlander turn off pacifism

Co-authored-by: Coffee <63162339+CoffeeDragon16@users.noreply.github.com>
---
 code/modules/antagonists/highlander/highlander.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index 910b0e32ea8..1d5c85d664a 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -9,12 +9,14 @@
 	var/mob/living/L = owner.current || mob_override
 	ADD_TRAIT(L, TRAIT_NOGUNS, "highlander")
 	ADD_TRAIT(L, TRAIT_NODISMEMBER, "highlander")
+	REMOVE_TRAIT(L, TRAIT_PACIFISM, ROUNDSTART_TRAIT)
 
 /datum/antagonist/highlander/remove_innate_effects(mob/living/mob_override)
 	var/mob/living/L = owner.current || mob_override
 	REMOVE_TRAIT(L, TRAIT_NOGUNS, "highlander")
 	REMOVE_TRAIT(L, TRAIT_NODISMEMBER, "highlander")
-
+	if(L.has_quirk(/datum/quirk/nonviolent))
+		ADD_TRAIT(L, TRAIT_PACIFISM, ROUNDSTART_TRAIT)
 /datum/antagonist/highlander/proc/forge_objectives()
 	var/datum/objective/steal/steal_objective = new
 	steal_objective.owner = owner