From 3f1b7e4dd6fb32f21494639ee6b86de8a2ddf271 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawamanthing@gmail.com>
Date: Sun, 9 Jun 2019 02:23:53 -0500
Subject: [PATCH] Pacifists can nom things now, but not feed to others

---
 code/modules/mob/living/living_defense.dm            | 12 ++++++++++++
 .../code/modules/vore/eating/bellymodes_vr.dm        |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 449bbe361f..e434bc4e95 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -124,6 +124,18 @@
 	if(user == anchored || !isturf(user.loc))
 		return FALSE
 
+	//pacifist vore check.
+	if(user.pulling && HAS_TRAIT(user, TRAIT_PACIFISM) && user.voremode) //they can only do heals, noisy guts, absorbing (technically not harm)
+		if(ismob(user.pulling))
+			var/mob/P = user.pulling
+			if(src != user)
+				to_chat(user, "<span class='notice'>You can't risk digestion!</span>")
+				return FALSE
+			else
+				user.vore_attack(user, P, user)
+				return
+
+	//normal vore check.
 	if(user.pulling && user.grab_state == GRAB_AGGRESSIVE && user.voremode)
 		if(ismob(user.pulling))
 			var/mob/P = user.pulling
diff --git a/modular_citadel/code/modules/vore/eating/bellymodes_vr.dm b/modular_citadel/code/modules/vore/eating/bellymodes_vr.dm
index 542241e9f2..6b6a3d30cc 100644
--- a/modular_citadel/code/modules/vore/eating/bellymodes_vr.dm
+++ b/modular_citadel/code/modules/vore/eating/bellymodes_vr.dm
@@ -49,13 +49,16 @@
 	var/sound/pred_death = sound(get_sfx("death_pred"))
 	var/turf/source = get_turf(owner)
 
-
 ///////////////////////////// DM_HOLD /////////////////////////////
 	if(digest_mode == DM_HOLD)
 		return SSBELLIES_PROCESSED
 
 //////////////////////////// DM_DIGEST ////////////////////////////
 	else if(digest_mode == DM_DIGEST)
+		if(HAS_TRAIT(owner, TRAIT_PACIFISM)) //obvious.
+			digest_mode = DM_NOISY
+			return
+
 		for (var/mob/living/M in contents)
 			if(prob(25))
 				if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
@@ -210,6 +213,10 @@
 //////////////////////////DM_DRAGON /////////////////////////////////////
 //because dragons need snowflake guts
 	if(digest_mode == DM_DRAGON)
+		if(HAS_TRAIT(owner, TRAIT_PACIFISM)) //imagine var editing this when you're a pacifist. smh
+			digest_mode = DM_NOISY
+			return
+
 		for (var/mob/living/M in contents)
 			if(prob(55)) //if you're hearing this, you're a vore ho anyway.
 				if((world.time - NORMIE_HEARCHECK) > last_hearcheck)