cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +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/components/species/shadekin/powers/dark_maw.dm
+1 -1
View File
@@ -156,7 +156,7 @@
/obj/effect/abstract/dark_maw/proc/do_trigger(var/mob/living/L)
var/will_vore = 1
if(!(target in owner) || CanPhaseVore(owner, L))
if(!(target in owner) || can_phase_vore(owner, L))
will_vore = 0
if(!src || src.gc_destroyed)
code/datums/components/species/shadekin/powers/phase_shift.dm
+2 -2
View File
@@ -169,12 +169,12 @@
var/mob/living/our_prey
if(potentials.len)
var/mob/living/target = pick(potentials)
if(CanPhaseVore(src, target))
if(can_phase_vore(src, target))
target.forceMove(vore_selected)
to_chat(target, span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.get_belly_name()]!"))
to_chat(src, span_vwarning("You phase around [target], [vore_selected.vore_verb]ing them into your [vore_selected.get_belly_name()]!"))
our_prey = target
else if(CanPhaseVore(target, src))
else if(can_phase_vore(target, src))
our_prey = src
forceMove(target.vore_selected)
to_chat(target, span_vwarning("\The [src] phases into you, [target.vore_selected.vore_verb]ing them into your [target.vore_selected.get_belly_name()]!"))
code/datums/components/traits/unlucky.dm
+1 -1
View File
@@ -167,7 +167,7 @@
continue //Don't do anything to ourselves.
if(living_mob.stat)
continue
if(!CanStumbleVore(living_guy, living_mob) && !CanStumbleVore(living_mob, living_guy)) //Works both ways! Either way, someone's getting eaten!
if(!can_stumble_vore(living_guy, living_mob) && !can_stumble_vore(living_mob, living_guy)) //Works both ways! Either way, someone's getting eaten!
continue
living_mob.stumble_into(living_guy) //logic reversed here because the game is DUMB. This means that living_guy is stumbling into the target!
living_guy.visible_message(span_danger("[living_guy] loses their balance and slips into [living_mob]!"), span_boldwarning("You lose your balance, slipping into [living_mob]!"))