From afa7b21dc94bfd7235fcfe491be51265eb91965d Mon Sep 17 00:00:00 2001 From: killer653 Date: Sat, 18 Nov 2017 10:37:58 -0500 Subject: [PATCH] Fixes permastuns. Prevents doubledamage --- code/modules/multiz/movement.dm | 4 +++- code/modules/multiz/movement_vr.dm | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 7f13cc25e92..e5dd11b1dec 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -353,9 +353,11 @@ 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! + return var/belly = src.vore_selected var/datum/belly/belly_target = pred.vore_organs[belly] - if(belly_target && belly_target.internal_contents.len != 0) + if(belly_target && belly_target.internal_contents.len != 0) //Having stuff in your gut will pad the landing a bit. damage = 5 //VOREStation Edit End apply_damage(rand(0, damage), BRUTE, BP_HEAD) apply_damage(rand(0, damage), BRUTE, BP_TORSO) diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index 20867e35e2f..725eba8bb52 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -9,6 +9,10 @@ Move(landing) return 1 + for(var/obj/O in loc) + if(!O.CanFallThru(src, landing)) + return 1 + if(drop_mob && drop_mob != src && ismob(drop_mob)) //Shitload of checks. This is because the game finds various ways to screw me over. drop_mob.fall_impact(src)