From 4e79dfdaa518ba1f4c40ba46039e5f62c0663511 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 5 Mar 2019 10:58:01 +0100 Subject: [PATCH 1/4] Making synxes able to feed themselves to people Oh how the turntables have tided --- code/modules/mob/living/simple_animal/animals/synx.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 74151981f8..de8ba3aab8 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -256,6 +256,9 @@ mob/living/simple_animal/synx/PunchTarget() if(.) // If we succeeded in hitting. if(isliving(A)) var/mob/living/L = A + prob(20) + L.Weaken(5) + src.feed_self_to_grabbed(L) if(L.reagents) var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD) if(L.can_inject(src, null, target_zone)) From fe12949a9a1778997acfc545d6c220bbf4672622 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 5 Mar 2019 11:00:38 +0100 Subject: [PATCH 2/4] Update synx.dm --- code/modules/mob/living/simple_animal/animals/synx.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index de8ba3aab8..9f69b5c31b 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -256,7 +256,7 @@ mob/living/simple_animal/synx/PunchTarget() if(.) // If we succeeded in hitting. if(isliving(A)) var/mob/living/L = A - prob(20) + if(prob(20)) L.Weaken(5) src.feed_self_to_grabbed(L) if(L.reagents) From 80c41aaf89186e0e2b24c54ccda01b5d397327dc Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 5 Mar 2019 11:03:44 +0100 Subject: [PATCH 3/4] Update synx.dm --- code/modules/mob/living/simple_animal/animals/synx.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 9f69b5c31b..52820ed344 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -256,9 +256,12 @@ mob/living/simple_animal/synx/PunchTarget() if(.) // If we succeeded in hitting. if(isliving(A)) var/mob/living/L = A - if(prob(20)) + if(prob(20))//Forcefeeding code L.Weaken(5) + stop_automated_movement = 1 src.feed_self_to_grabbed(L) + update_icon() + stop_automated_movement = 0 if(L.reagents) var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD) if(L.can_inject(src, null, target_zone)) From 20816b485f331f7609cf5a3ec8808ce492b08d00 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 5 Mar 2019 11:22:39 +0100 Subject: [PATCH 4/4] Update synx.dm --- code/modules/mob/living/simple_animal/animals/synx.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 52820ed344..0e1e8d9855 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -259,7 +259,7 @@ mob/living/simple_animal/synx/PunchTarget() if(prob(20))//Forcefeeding code L.Weaken(5) stop_automated_movement = 1 - src.feed_self_to_grabbed(L) + src.feed_self_to_grabbed(src,L) update_icon() stop_automated_movement = 0 if(L.reagents)