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

Merge pull request #4427 from CHOMPStation2/upstream-merge-13169

Browse Source 
[MIRROR] Fixes dropnoms with pred without bellies breaking falling
This commit is contained in:
Nadyr
2022-06-26 15:55:33 -04:00
committed by GitHub
parent 88aee32b41 6297b88fb1
commit 8c835ecec4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/multiz/movement_vr.dm
+4 -4
View File
@@ -43,16 +43,16 @@
var/mob/living/prey = src
var/fallloc = prey.loc
if(pred.can_be_drop_pred && prey.can_be_drop_prey && pred.drop_vore && prey.drop_vore)
if(pred.vore_selected && pred.can_be_drop_pred && prey.can_be_drop_prey && pred.drop_vore && prey.drop_vore)
pred.feed_grabbed_to_self_falling_nom(pred,prey)
pred.loc = fallloc
if(!safe_fall)
pred.Weaken(8)
pred.visible_message("<span class='danger'>\The [pred] falls right onto \the [prey]!</span>")
else if(prey.can_be_drop_pred && pred.can_be_drop_prey && pred.drop_vore && prey.drop_vore)
else if(prey.vore_selected && prey.can_be_drop_pred && pred.can_be_drop_prey && pred.drop_vore && prey.drop_vore)
prey.feed_grabbed_to_self_falling_nom(prey,pred)
pred.Weaken(4)
pred.visible_message("<span class='danger'>\The [pred] falls right into \the [prey]!</span>")
prey.Weaken(4)
prey.visible_message("<span class='danger'>\The [pred] falls right into \the [prey]!</span>")
else
pred.loc = prey.loc
if(!safe_fall)