From 04f1066c87541a79b92bbfcf4a8feabd5a7e8d81 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 28 Oct 2017 14:19:01 +0300 Subject: [PATCH 1/2] Couple otie tweaks. -Makes sec otie start with safe belly upon eating any human, not just crime threat ones. (retaliation against lawful crew members etc.) -Brings back the grab-unfriend thing. The friend thing literally only tells it who to follow around and currently there is no other "stay" command to get it off your tail without just passing it for someone else's trouble. --- code/modules/mob/living/simple_animal/vore/otie.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm index 8ce026e002a..ab42f5e6e08 100644 --- a/code/modules/mob/living/simple_animal/vore/otie.dm +++ b/code/modules/mob/living/simple_animal/vore/otie.dm @@ -154,7 +154,7 @@ /mob/living/simple_animal/otie/friendly/security/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey) // Make the gut start out safe for bellybrigging. var/datum/belly/B = user.vore_selected var/datum/belly/belly_target = user.vore_organs[B] - if(check_threat(target_mob) >= 4) + if(ishuman(target)) belly_target.digest_mode = DM_HOLD if(istype(prey,/mob/living/simple_animal/mouse)) belly_target.digest_mode = DM_DIGEST @@ -261,6 +261,8 @@ if(I_GRAB) if(health > 0) audible_emote("growls disapprovingly at [M].") + if(M == friend) + friend = null return else ..() From 26e9e949495716e2b6b4e67fa93facd9c5a9a2d1 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 28 Oct 2017 16:16:05 +0300 Subject: [PATCH 2/2] Update otie.dm --- code/modules/mob/living/simple_animal/vore/otie.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm index ab42f5e6e08..8b1fd3ffbb0 100644 --- a/code/modules/mob/living/simple_animal/vore/otie.dm +++ b/code/modules/mob/living/simple_animal/vore/otie.dm @@ -154,7 +154,7 @@ /mob/living/simple_animal/otie/friendly/security/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey) // Make the gut start out safe for bellybrigging. var/datum/belly/B = user.vore_selected var/datum/belly/belly_target = user.vore_organs[B] - if(ishuman(target)) + if(ishuman(target_mob)) belly_target.digest_mode = DM_HOLD if(istype(prey,/mob/living/simple_animal/mouse)) belly_target.digest_mode = DM_DIGEST