cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13169 from Heroman3003/small-dropnom

Browse Source 
Fixes dropnoms with pred without bellies breaking falling
This commit is contained in:
Casey
2022-06-26 14:03:56 -04:00
committed by CHOMPStation2
parent 2531f1d482
commit d3c2022b05
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/multiz/movement_vr.dm
View File

@@ -43,16 +43,16 @@
var/mob/living/prey = src var/mob/living/prey = src
var/fallloc = prey.loc 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.feed_grabbed_to_self_falling_nom(pred,prey)
pred.loc = fallloc pred.loc = fallloc
if(!safe_fall) if(!safe_fall)
pred.Weaken(8) pred.Weaken(8)
pred.visible_message("<span class='danger'>\The [pred] falls right onto \the [prey]!</span>") 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) prey.feed_grabbed_to_self_falling_nom(prey,pred)
pred.Weaken(4) prey.Weaken(4)
pred.visible_message("<span class='danger'>\The [pred] falls right into \the [prey]!</span>") prey.visible_message("<span class='danger'>\The [pred] falls right into \the [prey]!</span>")
else else
pred.loc = prey.loc pred.loc = prey.loc
if(!safe_fall) if(!safe_fall)