Skip to content

Commit

Permalink
Merge pull request TS-Rogue-Star#313 from Durandaal/Ghost-Vorebelly-F…
Browse files Browse the repository at this point in the history
…ixes-2.0

Fixes Ghosts Being Counted as Apart of Vorebelly Contents
  • Loading branch information
Very-Soft authored May 18, 2024
2 parents befee0e + 2495c0c commit b90fbec
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions code/modules/vore/eating/belly_obj_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,17 @@
for(var/mob/living/L in contents)
living_count++

//RSEdit Start || Ports fixes from VOREStation PR#15918
var/count_total = contents.len
for(var/mob/observer/C in contents)
count_total-- //Exclude any ghosts from %count

var/list/vore_contents = list()
for(var/G in contents)
if(!isobserver(G))
vore_contents += G //Exclude any ghosts from %prey
//RSEdit end

for(var/mob/living/P in contents)
if(!P.absorbed) //This is required first, in case there's a person absorbed and not absorbed in a stomach.
total_bulge += P.size_multiplier
Expand All @@ -636,9 +647,9 @@

formatted_message = replacetext(raw_message, "%belly", lowertext(name))
formatted_message = replacetext(formatted_message, "%pred", owner)
formatted_message = replacetext(formatted_message, "%prey", english_list(contents))
formatted_message = replacetext(formatted_message, "%prey", english_list(vore_contents))
formatted_message = replacetext(formatted_message, "%countprey", living_count)
formatted_message = replacetext(formatted_message, "%count", contents.len)
formatted_message = replacetext(formatted_message, "%count", count_total)

return("<span class='warning'>[formatted_message]</span>")

Expand Down

0 comments on commit b90fbec

Please sign in to comment.