cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 15:15:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a bug with reagent splashing (#18831)

Browse Source
This commit is contained in:
Cameron Lennox
2025-11-27 23:46:22 -05:00
committed by GitHub
parent a26c2402db
commit 2b2fbeec81
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/belly_obj_liquids.dm
+2 -2
View File
@@ -30,10 +30,10 @@
if(!L.permit_healbelly && is_beneficial) // Healing reagents turned off in preferences!
continue
if(reagents.total_volume)
reagents.trans_to(L, affecting_amt, 1, FALSE)
reagents.splash_mob(L, affecting_amt, FALSE)
if(L.permit_healbelly && digest_mode == DM_HEAL)
if(is_beneficial && reagents.total_volume)
reagents.trans_to(L, affecting_amt, 1, FALSE)
reagents.splash_mob(L, affecting_amt, FALSE)
for(var/obj/item/I in touchable_atoms)
if(is_type_in_list(I, GLOB.item_digestion_blacklist))
continue
code/modules/vore/eating/belly_obj_vr.dm
+12 -12
View File
@@ -572,10 +572,10 @@
var/obj/item/I = thing
startfx.Add(get_belly_surrounding(I.contents))
for(var/mob/living/M in startfx) // End of indirect vorefx changes
M.updateVRPanel()
for(var/mob/living/living_mob in startfx) // End of indirect vorefx changes
living_mob.updateVRPanel()
var/raw_desc //Let's use this to avoid needing to write the reformat code twice
if(absorbed_desc && M.absorbed)
if(absorbed_desc && living_mob.absorbed)
raw_desc = absorbed_desc
else if(desc)
raw_desc = desc
@@ -583,21 +583,21 @@
//Was there a description text? If so, it's time to format it!
if(raw_desc)
//Replace placeholder vars
to_chat(M, span_vnotice(span_bold("[belly_format_string(raw_desc, M)]")))
to_chat(living_mob, span_vnotice(span_bold("[belly_format_string(raw_desc, living_mob)]")))
var/taste
if(can_taste && M.loc == src && (taste = M.get_taste_message(FALSE))) // Prevent indirect tasting
to_chat(owner, span_vnotice("[M] tastes of [taste]."))
vore_fx(M, TRUE)
if(can_taste && living_mob.loc == src && (taste = living_mob.get_taste_message(FALSE))) // Prevent indirect tasting
to_chat(owner, span_vnotice("[living_mob] tastes of [taste]."))
vore_fx(living_mob, TRUE)
if(owner.previewing_belly == src)
vore_fx(owner, TRUE)
//Stop AI processing in bellies
if(M.ai_holder)
M.ai_holder.go_sleep()
if(living_mob.ai_holder)
living_mob.ai_holder.go_sleep()
if(reagents.total_volume >= 5)
if(digest_mode == DM_DIGEST && M.digestable)
reagents.trans_to(M, reagents.total_volume * 0.1, 1 / max(LAZYLEN(contents), 1), FALSE)
to_chat(M, span_vwarning(span_bold("You splash into a pool of [reagent_name]!")))
if(digest_mode == DM_DIGEST && living_mob.digestable)
reagents.splash_mob(living_mob, reagents.total_volume * 0.1, FALSE)
to_chat(living_mob, span_vwarning(span_bold("You splash into a pool of [reagent_name]!")))
if(!isliving(thing) && count_items_for_sprite) // If this is enabled also update fullness for non-living things
owner.handle_belly_update() // This is run whenever a belly's contents are changed.