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

fix vore helpers (#18724)

Browse Source 
* fix vore helpers

* .

* fix that too
This commit is contained in:
Kashargul
2025-11-03 20:38:11 -05:00
committed by GitHub
parent 850bc7c5ad
commit d9b5e1fdc9
20 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/vore/spontaneous_vore.dm
+8 -8
View File
@@ -26,14 +26,14 @@
return
//We are able to eat the person stumbling into us.
if(CanStumbleVore(prey = target, pred = source)) //This is if the person stumbling into us is able to eat us!
if(can_stumble_vore(prey = target, pred = source)) //This is if the person stumbling into us is able to eat us!
source.visible_message(span_vwarning("[target] flops carelessly into [source]!"))
source.begin_instant_nom(source, prey = target, pred = source, belly = source.vore_selected)
target.stop_flying()
return CANCEL_STUMBLED_INTO
//The person stumbling into us is able to eat us.
if(CanStumbleVore(prey = source, pred = target)) //This is if the person stumbling into us is able to be eaten by us! BROKEN!
if(can_stumble_vore(prey = source, pred = target)) //This is if the person stumbling into us is able to be eaten by us! BROKEN!
source.visible_message(span_vwarning("[target] flops carelessly into [source]!"))
target.forceMove(get_turf(source))
source.begin_instant_nom(target, prey = source, pred = target, belly = target.vore_selected)
@@ -52,7 +52,7 @@
//pred = drop_mob
//prey = source
//result: source is eaten by drop_mob
if(CanDropVore(prey = source, pred = drop_mob))
if(can_drop_vore(prey = source, pred = drop_mob))
drop_mob.feed_grabbed_to_self_falling_nom(drop_mob, prey = source)
drop_mob.visible_message(span_vdanger("\The [drop_mob] falls right onto \the [source]!"))
return COMSIG_CANCEL_FALL
@@ -60,7 +60,7 @@
//pred = source
//prey = drop_mob
//result: drop_mob is eaten by source
if(CanDropVore(prey = drop_mob, pred = source))
if(can_drop_vore(prey = drop_mob, pred = source))
source.feed_grabbed_to_self_falling_nom(source, prey = drop_mob)
source.Weaken(4)
source.visible_message(span_vdanger("\The [drop_mob] falls right into \the [source]!"))
@@ -93,7 +93,7 @@
// PERSON BEING HIT: CAN BE DROP PRED, ALLOWS THROW VORE.
// PERSON BEING THROWN: DEVOURABLE, ALLOWS THROW VORE, CAN BE DROP PREY.
if(CanThrowVore(prey = thrown_mob, pred = source))
if(can_throw_vore(prey = thrown_mob, pred = source))
if(!source.vore_selected)
return
source.vore_selected.nom_mob(thrown_mob) //Eat them!!!
@@ -106,7 +106,7 @@
// PERSON BEING HIT: CAN BE DROP PREY, ALLOWS THROW VORE, AND IS DEVOURABLE.
// PERSON BEING THROWN: CAN BE DROP PRED, ALLOWS THROW VORE.
else if(CanThrowVore(prey = source, pred = thrown_mob))//Pred thrown into prey.
else if(can_throw_vore(prey = source, pred = thrown_mob))//Pred thrown into prey.
if(!thrown_mob.vore_selected)
return
source.visible_message(span_vwarning("[source] suddenly slips inside of [thrown_mob]'s [lowertext(thrown_mob.vore_selected.name)] as [thrown_mob] flies into them!"))
@@ -125,11 +125,11 @@
return
//Person being slipped into eats the person slipping
if(CanSlipVore(pred = source, prey = crossed)) //If we can vore them go for it
if(can_slip_vore(pred = source, prey = crossed)) //If we can vore them go for it
source.begin_instant_nom(source, prey = crossed, pred = source, belly = source.vore_selected)
return COMPONENT_BLOCK_CROSS
//The person slipping eats the person being slipped into
else if(CanSlipVore(pred = crossed, prey = source))
else if(can_slip_vore(pred = crossed, prey = source))
source.begin_instant_nom(crossed, prey = source, pred = crossed, belly = crossed.vore_selected) //Must be
return //We DON'T block it here. Pred can slip onto the prey's tile, no problem.