From 9ead1295e1eada52f14432003917dda69c4fdee2 Mon Sep 17 00:00:00 2001 From: killer653 Date: Sat, 18 Nov 2017 11:10:53 -0500 Subject: [PATCH] Github didn't push this --- code/modules/multiz/movement.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index e5dd11b1de..0521d3e700 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -353,7 +353,8 @@ playsound(loc, "punch", 25, 1, -1) var/damage = 15 // Because wounds heal rather quickly, 15 should be enough to discourage jumping off but not be enough to ruin you, at least for the first time. var/mob/living/carbon/human/pred = src //VOREStation Edit Start - if(istype(landing, /mob)) //If you land on someone, don't get hurt! + if(istype(landing, /mob)) //If you land on someone, don't get hurt a second time + Weaken(10) //In exchange, you're going to be aching! This prevents you from taking damage twice from hitting the floor and the person. return var/belly = src.vore_selected var/datum/belly/belly_target = pred.vore_organs[belly]