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

[MIRROR] Fixes dark maw not eating captured prey (#12219)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-01-05 21:01:03 +01:00
committed by GitHub
co-authored by Guti
parent 62e89b8654
commit e54bb9d80e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_helpers/vore.dm
+7 -6
View File
@@ -4,7 +4,7 @@
/// Most basic check of them all.
/// Checks if PRED can eat PREY.
/proc/can_vore(mob/living/pred, mob/living/prey)
/proc/can_vore(mob/living/pred, mob/living/prey, allow_incorporeal = FALSE)
if(pred == prey)
return FALSE
if(!istype(pred) || !istype(prey))
@@ -14,7 +14,8 @@
if(!is_vore_predator(pred))
return FALSE
if(prey.is_incorporeal() || pred.is_incorporeal())
return FALSE
if(!allow_incorporeal)
return FALSE
if(!pred.vore_selected)
return FALSE
if(!pred.can_be_afk_pred && (!pred.client || pred.away_from_keyboard))
@@ -27,8 +28,8 @@
/// Basic spont vore check.
/// Checks if both have spont vore enable
/proc/can_spontaneous_vore(mob/living/pred, mob/living/prey)
if(!can_vore(pred, prey))
/proc/can_spontaneous_vore(mob/living/pred, mob/living/prey, allow_incorporeal = FALSE)
if(!can_vore(pred, prey, allow_incorporeal))
return FALSE
if(!pred.can_be_drop_pred || !prey.can_be_drop_prey)
return FALSE
@@ -62,8 +63,8 @@
return FALSE
return TRUE
/proc/can_phase_vore(mob/living/pred, mob/living/prey)
if(!can_spontaneous_vore(pred, prey))
/proc/can_phase_vore(mob/living/pred, mob/living/prey, allow_incorporeal = FALSE)
if(!can_spontaneous_vore(pred, prey, allow_incorporeal))
return FALSE
if(!pred.phase_vore || !prey.phase_vore)
return FALSE
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) || !can_phase_vore(owner, L))
if(!(target in owner) || !can_phase_vore(owner, L, TRUE))
will_vore = 0
if(!src || src.gc_destroyed)