diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 00acb38504a..66276e6306e 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -361,9 +361,15 @@ var/raw_message = pick(examine_messages) var/total_bulge = 0 - formatted_message = replacetext(raw_message, "%belly" ,lowertext(name)) - formatted_message = replacetext(formatted_message, "%pred" ,owner) - formatted_message = replacetext(formatted_message, "%prey" ,english_list(contents)) + var/living_count = 0 + for(var/mob/living/L in contents) + living_count++ + + 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, "%count", contents.len) + formatted_message = replacetext(formatted_message, "%countprey", living_count) 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 @@ -582,13 +588,21 @@ var/struggle_outer_message = pick(struggle_messages_outside) var/struggle_user_message = pick(struggle_messages_inside) + var/living_count = 0 + for(var/mob/living/L in contents) + living_count++ + struggle_outer_message = replacetext(struggle_outer_message, "%pred", owner) struggle_outer_message = replacetext(struggle_outer_message, "%prey", R) struggle_outer_message = replacetext(struggle_outer_message, "%belly", lowertext(name)) + struggle_outer_message = replacetext(struggle_outer_message, "%count", contents.len) + struggle_outer_message = replacetext(struggle_outer_message, "%countprey", living_count) struggle_user_message = replacetext(struggle_user_message, "%pred", owner) struggle_user_message = replacetext(struggle_user_message, "%prey", R) struggle_user_message = replacetext(struggle_user_message, "%belly", lowertext(name)) + struggle_user_message = replacetext(struggle_user_message, "%count", contents.len) + struggle_user_message = replacetext(struggle_user_message, "%countprey", living_count) struggle_outer_message = "[struggle_outer_message]" struggle_user_message = "[struggle_user_message]" diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 83f847bf0d4..599ec727797 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -205,14 +205,22 @@ var/digest_alert_prey = pick(digest_messages_prey) var/compensation = M.getOxyLoss() //How much of the prey's damage was caused by passive crit oxyloss to compensate the lost nutrition. + var/living_count = 0 + for(var/mob/living/L in contents) + living_count++ + //Replace placeholder vars digest_alert_owner = replacetext(digest_alert_owner, "%pred", owner) digest_alert_owner = replacetext(digest_alert_owner, "%prey", M) digest_alert_owner = replacetext(digest_alert_owner, "%belly", lowertext(name)) + digest_alert_owner = replacetext(digest_alert_owner, "%count", contents.len) + digest_alert_owner = replacetext(digest_alert_owner, "%countprey", living_count) digest_alert_prey = replacetext(digest_alert_prey, "%pred", owner) digest_alert_prey = replacetext(digest_alert_prey, "%prey", M) digest_alert_prey = replacetext(digest_alert_prey, "%belly", lowertext(name)) + digest_alert_prey = replacetext(digest_alert_prey, "%count", contents.len) + digest_alert_prey = replacetext(digest_alert_prey, "%countprey", living_count) //Send messages to_chat(owner, "[digest_alert_owner]") diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 945b9e1bd1b..35deada4148 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -653,7 +653,7 @@ . = TRUE if("b_msgs") alert(user,"Setting abusive or deceptive messages will result in a ban. Consider this your warning. Max 150 characters per message, max 10 messages per topic.","Really, don't.") - var/help = " Press enter twice to separate messages. '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name." + var/help = " Press enter twice to separate messages. '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. '%count' will be replaced with the number of anything in your belly. '%countprey' will be replaced with the number of living prey in your belly." switch(params["msgtype"]) if("dmp") var/new_message = input(user,"These are sent to prey when they expire. Write them in 2nd person ('you feel X'). Avoid using %prey in this type."+help,"Digest Message (to prey)",host.vore_selected.get_messages("dmp")) as message