cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes permastuns. Prevents doubledamage

Browse Source
This commit is contained in:
killer653
2017-11-18 10:37:58 -05:00
parent 0b41f58868
commit afa7b21dc9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/multiz/movement.dm
+3 -1
View File
@@ -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)
code/modules/multiz/movement_vr.dm
+4
View File
@@ -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)