diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 7097aaf27d..9d8e712b2d 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -1,6 +1,8 @@ ///////////////////// Mob Living ///////////////////// /mob/living var/digestable = TRUE // Can the mob be digested inside a belly? + var/devourable = TRUE // Can the mob be devoured at all? + var/feeding = TRUE // Can the mob be vorishly force fed or fed to others? var/digest_leave_remains = FALSE // Will this mob leave bones/skull/etc after the melty demise? var/allowmobvore = TRUE // Will simplemobs attempt to eat the mob? var/showvoreprefs = TRUE // Determines if the mechanical vore preferences button will be displayed on the mob or not. @@ -35,7 +37,7 @@ M.verbs += /mob/living/proc/lick M.verbs += /mob/living/proc/switch_scaling if(M.no_vore) //If the mob isn't supposed to have a stomach, let's not give it an insidepanel so it can make one for itself, or a stomach. - return 1 + return TRUE M.verbs += /mob/living/proc/insidePanel //Tries to load prefs if a client is present otherwise gives freebie stomach @@ -43,8 +45,8 @@ if(M) M.init_vore() - //Return 1 to hook-caller - return 1 + //return TRUE to hook-caller + return TRUE /mob/living/proc/init_vore() //Something else made organs, meanwhile. @@ -65,10 +67,10 @@ LAZYINITLIST(vore_organs) var/obj/belly/B = new /obj/belly(src) vore_selected = B - B.immutable = 1 + B.immutable = TRUE B.name = "Stomach" B.desc = "It appears to be rather warm and wet. Makes sense, considering it's inside \the [name]." - B.can_taste = 1 + B.can_taste = TRUE return TRUE // @@ -93,29 +95,45 @@ var/mob/living/attacker = user // Typecast to living - // src is the mob clicked on + // src is the mob clicked on and attempted predator - ///// If grab clicked on grabber + ///// If user clicked on themselves if((src == G.assailant) && (is_vore_predator(src))) - if (src.feed_grabbed_to_self(src, G.affecting)) + if(!(G.affecting.devourable)) + to_chat(user, "They aren't able to be devoured.") + return FALSE + if(src.feed_grabbed_to_self(src, G.affecting)) qdel(G) - return 1 + return TRUE else log_debug("[attacker] attempted to feed [G.affecting] to [user] ([user.type]) but it failed.") - ///// If grab clicked on grabbed + ///// If user clicked on their grabbed target else if((src == G.affecting) && (attacker.a_intent == I_GRAB) && (attacker.zone_sel.selecting == BP_TORSO) && (is_vore_predator(G.affecting))) + if(!(G.affecting.feeding)) + to_chat(user, "[G.affecting] isn't willing to be fed.") + return FALSE if (attacker.feed_self_to_grabbed(attacker, G.affecting)) qdel(G) - return 1 + return TRUE else log_debug("[attacker] attempted to feed [user] to [G.affecting] ([G.affecting.type]) but it failed.") - ///// If grab clicked on anyone else + ///// If user clicked on anyone else but their grabbed target else if((src != G.affecting) && (src != G.assailant) && (is_vore_predator(src))) + if(!(src.feeding)) + to_chat(user, "[src] isn't willing to be fed.") + return FALSE + if(!(G.affecting.devourable)) + to_chat(user, "[G.affecting] isn't able to be devoured.") + return FALSE + if(!(G.affecting.feeding)) + to_chat(user, "[src] isn't able to be fed to someone.") + return FALSE + if (attacker.feed_grabbed_to_other(attacker, G.affecting, src)) qdel(G) - return 1 + return TRUE else log_debug("[attacker] attempted to feed [G.affecting] to [src] ([src.type]) but it failed.") @@ -123,7 +141,7 @@ else if(istype(I,/obj/item/weapon/holder)) var/obj/item/weapon/holder/H = I - if(!isliving(user)) return 0 // Return 0 to continue upper procs + if(!isliving(user)) return FALSE // return FALSE to continue upper procs var/mob/living/attacker = user // Typecast to living if (is_vore_predator(src)) @@ -131,7 +149,7 @@ if (attacker.eat_held_mob(attacker, M, src)) if (H.held_mob == M) H.held_mob = null - return 1 //Return 1 to exit upper procs + return TRUE //return TRUE to exit upper procs else log_debug("[attacker] attempted to feed [H.contents] to [src] ([src.type]) but it failed.") @@ -141,16 +159,16 @@ if(confirm == "Yes!") var/obj/belly/B = input("Which belly?","Select A Belly") as null|anything in vore_organs if(!istype(B)) - return 1 + return TRUE visible_message("[user] is trying to stuff a beacon into [src]'s [lowertext(B.name)]!","[user] is trying to stuff a beacon into you!") if(do_after(user,30,src)) user.drop_item() I.forceMove(B) - return 1 + return TRUE else - return 1 //You don't get to hit someone 'later' + return TRUE //You don't get to hit someone 'later' - return 0 + return FALSE // // Our custom resist catches for /mob/living @@ -165,39 +183,41 @@ //Other overridden resists go here - return 0 + return FALSE // // Verb for saving vore preferences to save file // /mob/living/proc/save_vore_prefs() if(!client || !client.prefs_vr) - return 0 + return FALSE if(!copy_to_prefs_vr()) - return 0 + return FALSE if(!client.prefs_vr.save_vore()) - return 0 + return FALSE - return 1 + return TRUE /mob/living/proc/apply_vore_prefs() if(!client || !client.prefs_vr) - return 0 + return FALSE if(!client.prefs_vr.load_vore()) - return 0 + return FALSE if(!copy_from_prefs_vr()) - return 0 + return FALSE - return 1 + return TRUE /mob/living/proc/copy_to_prefs_vr() if(!client || !client.prefs_vr) to_chat(src,"You attempted to save your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.") - return 0 + return FALSE var/datum/vore_preferences/P = client.prefs_vr P.digestable = src.digestable + P.devourable = src.devourable + P.feeding = src.feeding P.digest_leave_remains = src.digest_leave_remains P.allowmobvore = src.allowmobvore P.vore_taste = src.vore_taste @@ -212,7 +232,7 @@ P.belly_prefs = serialized - return 1 + return TRUE // // Proc for applying vore preferences, given bellies @@ -220,11 +240,13 @@ /mob/living/proc/copy_from_prefs_vr() if(!client || !client.prefs_vr) to_chat(src,"You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.") - return 0 + return FALSE var/datum/vore_preferences/P = client.prefs_vr digestable = P.digestable + devourable = P.devourable + feeding = P.feeding digest_leave_remains = P.digest_leave_remains allowmobvore = P.allowmobvore vore_taste = P.vore_taste @@ -237,7 +259,7 @@ for(var/entry in P.belly_prefs) list_to_object(entry,src) - return 1 + return TRUE // // Release everything in every vore organ @@ -305,7 +327,7 @@ /mob/living/proc/get_taste_message(allow_generic = 1) if(!vore_taste && !allow_generic) - return 0 + return FALSE var/taste_message = "" if(vore_taste && (vore_taste != "")) @@ -411,7 +433,7 @@ var/user_to_prey = get_dist(get_turf(user),get_turf(prey)) if(user_to_pred > 1 || user_to_prey > 1) - return 0 + return FALSE // Prepare messages if(user == pred) //Feeding someone to yourself @@ -433,7 +455,7 @@ //Timer and progress bar if(!do_after(user, swallow_time, prey)) - return 0 // Prey escpaed (or user disabled) before timer expired. + return FALSE // Prey escpaed (or user disabled) before timer expired. // If we got this far, nom successful! Announce it! user.visible_message(success_msg) @@ -452,7 +474,7 @@ add_attack_logs(pred,prey,"Eaten via [belly.name]") else add_attack_logs(user,pred,"Forced to eat [key_name(prey)]") - return 1 + return TRUE // // Magical pred-air breathing for inside preds @@ -685,11 +707,13 @@ if("CHAT_LOOC" in client.prefs.preferences_disabled) dispvoreprefs += "LOOC DISABLED
" dispvoreprefs += "Digestable: [digestable ? "Enabled" : "Disabled"]
" + dispvoreprefs += "Devourable: [devourable ? "Enabled" : "Disabled"]
" + dispvoreprefs += "Feedable: [feeding ? "Enabled" : "Disabled"]
" dispvoreprefs += "Leaves Remains: [digest_leave_remains ? "Enabled" : "Disabled"]
" dispvoreprefs += "Mob Vore: [allowmobvore ? "Enabled" : "Disabled"]
" dispvoreprefs += "Healbelly permission: [permit_healbelly ? "Allowed" : "Disallowed"]
" - dispvoreprefs += "Drop-nom prey: [can_be_drop_prey ? "Enabled" : "Disabled"]
" - dispvoreprefs += "Drop-nom pred: [can_be_drop_pred ? "Enabled" : "Disabled"]
" + dispvoreprefs += "Spontaneous vore prey: [can_be_drop_prey ? "Enabled" : "Disabled"]
" + dispvoreprefs += "Spontaneous vore pred: [can_be_drop_pred ? "Enabled" : "Disabled"]
" user << browse("Vore prefs: [src]
[dispvoreprefs]
", "window=[name];size=200x300;can_resize=0;can_minimize=0") onclose(user, "[name]") return diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index efc0c451c8..168ec9ccfa 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -19,14 +19,14 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE -Aro <3 */ -#define VORE_VERSION 1 //This is a Define so you don't have to worry about magic numbers. +#define VORE_VERSION 2 //This is a Define so you don't have to worry about magic numbers. // // Overrides/additions to stock defines go here, as well as hooks. Sort them by // the object they are overriding. So all /mob/living together, etc. // /datum/configuration - var/items_survive_digestion = 1 //For configuring if the important_items survive digestion + var/items_survive_digestion = TRUE //For configuring if the important_items survive digestion // // The datum type bolted onto normal preferences datums for storing Virgo stuff @@ -37,13 +37,15 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE /hook/client_new/proc/add_prefs_vr(client/C) C.prefs_vr = new/datum/vore_preferences(C) if(C.prefs_vr) - return 1 + return TRUE - return 0 + return FALSE /datum/vore_preferences //Actual preferences var/digestable = TRUE + var/devourable = TRUE + var/feeding = TRUE var/digest_leave_remains = FALSE var/allowmobvore = TRUE var/list/belly_prefs = list() @@ -70,9 +72,9 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE /proc/is_vore_predator(var/mob/living/O) if(istype(O,/mob/living)) if(O.vore_organs.len > 0) - return 1 + return TRUE - return 0 + return FALSE // // Belly searching for simplifying other procs @@ -91,27 +93,29 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE /datum/vore_preferences/proc/load_vore() if(!client || !client_ckey) - return 0 //No client, how can we save? + return FALSE //No client, how can we save? if(!client.prefs || !client.prefs.default_slot) - return 0 //Need to know what character to load! + return FALSE //Need to know what character to load! slot = client.prefs.default_slot load_path(client_ckey,slot) - if(!path) return 0 //Path couldn't be set? + if(!path) return FALSE //Path couldn't be set? if(!fexists(path)) //Never saved before save_vore() //Make the file first - return 1 + return TRUE var/list/json_from_file = json_decode(file2text(path)) if(!json_from_file) - return 0 //My concern grows + return FALSE //My concern grows var/version = json_from_file["version"] json_from_file = patch_version(json_from_file,version) digestable = json_from_file["digestable"] + devourable = json_from_file["devourable"] + feeding = json_from_file["feeding"] digest_leave_remains = json_from_file["digest_leave_remains"] allowmobvore = json_from_file["allowmobvore"] vore_taste = json_from_file["vore_taste"] @@ -123,6 +127,10 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE //Quick sanitize if(isnull(digestable)) digestable = TRUE + if(isnull(devourable)) + devourable = TRUE + if(isnull(feeding)) + feeding = TRUE if(isnull(digest_leave_remains)) digest_leave_remains = FALSE if(isnull(allowmobvore)) @@ -136,15 +144,17 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE if(isnull(belly_prefs)) belly_prefs = list() - return 1 + return TRUE /datum/vore_preferences/proc/save_vore() - if(!path) return 0 + if(!path) return FALSE var/version = VORE_VERSION //For "good times" use in the future var/list/settings_list = list( "version" = version, "digestable" = digestable, + "devourable" = devourable, + "feeding" = feeding, "digest_leave_remains" = digest_leave_remains, "allowmobvore" = allowmobvore, "vore_taste" = vore_taste, @@ -158,7 +168,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE var/json_to_file = json_encode(settings_list) if(!json_to_file) log_debug("Saving: [path] failed jsonencode") - return 0 + return FALSE //Write it out #ifdef RUST_G @@ -171,9 +181,9 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE #endif if(!fexists(path)) log_debug("Saving: [path] failed file write") - return 0 + return FALSE - return 1 + return TRUE //Can do conversions here /datum/vore_preferences/proc/patch_version(var/list/json_from_file,var/version) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 1527092a29..c9a212f293 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -193,7 +193,7 @@ dat += "
Is this belly fleshy:" dat += "[selected.is_wet ? "Yes" : "No"]" if(selected.is_wet) - dat += "Internal loop for prey?:" + dat += "
Internal loop for prey?:" dat += "[selected.wet_loop ? "Yes" : "No"]" //Digest Mode Button @@ -309,30 +309,47 @@ switch(user.digestable) if(TRUE) - dat += "Toggle Digestable" + dat += "Toggle Digestable (Currently: ON)" if(FALSE) - dat += "Toggle Digestable" - + dat += "Toggle Digestable (Currently: OFF)" + switch(user.devourable) + if(TRUE) + dat += "Toggle Devourable (Currently: ON)" + if(FALSE) + dat += "Toggle Devourable (Currently: OFF)" + switch(user.feeding) + if(TRUE) + dat += "
Toggle Feeding (Currently: ON)" + if(FALSE) + dat += "
Toggle Feeding (Currently: OFF)" switch(user.digest_leave_remains) if(TRUE) - dat += "Toggle Leaving Remains" + dat += "Toggle Leaving Remains (Currently: ON)" if(FALSE) - dat += "Toggle Leaving Remains" - + dat += "Toggle Leaving Remains (Currently: OFF)" switch(user.allowmobvore) if(TRUE) - dat += "
Toggle Mob Vore" + dat += "
Toggle Mob Vore (Currently: ON)" if(FALSE) - dat += "
Toggle Mob Vore" - + dat += "
Toggle Mob Vore (Currently: OFF)" switch(user.permit_healbelly) if(TRUE) - dat += "Toggle Healbelly Permission" + dat += "Toggle Healbelly Permission (Currently: ON)" if(FALSE) - dat += "Toggle Healbelly Permission" + dat += "Toggle Healbelly Permission (Currently: OFF)" + + switch(user.can_be_drop_prey) + if(TRUE) + dat += "
Toggle Prey Spontaneous Vore (Currently: ON)" + if(FALSE) + dat += "
Toggle Prey Spontaneous Vore (Currently: OFF)" + + switch(user.can_be_drop_pred) + if(TRUE) + dat += "Toggle Pred Spontaneous Vore (Currently: ON)" + if(FALSE) + dat += "Toggle Pred Spontaneous Vore (Currently: OFF)" - dat += "
Toggle Drop-nom Prey" //These two get their own, custom row, too. - dat += "Toggle Drop-nom Pred" dat += "
Set Your Taste" dat += "Toggle Hunger Noises" @@ -357,7 +374,7 @@ if(href_list["show_int"]) show_interacts = !show_interacts - return 1 //Force update + return TRUE //Force update if(href_list["int_help"]) alert("These control how your belly responds to someone using 'resist' while inside you. The percent chance to trigger each is listed below, \ @@ -365,13 +382,13 @@ These only function as long as interactions are turned on in general. Keep in mind, the 'belly mode' interactions (digest/absorb) \ will affect all prey in that belly, if one resists and triggers digestion/absorption. If multiple trigger at the same time, \ only the first in the order of 'Escape > Transfer > Absorb > Digest' will occur.","Interactions Help") - return 0 //Force update + return FALSE //Force update if(href_list["outsidepick"]) var/atom/movable/tgt = locate(href_list["outsidepick"]) var/obj/belly/OB = locate(href_list["outsidebelly"]) if(!(tgt in OB)) //Aren't here anymore, need to update menu. - return 1 + return TRUE var/intent = "Examine" if(istype(tgt,/mob/living)) @@ -384,7 +401,7 @@ if("Help Out") //Help the inside-mob out if(user.stat || user.absorbed || M.absorbed) to_chat(user,"You can't do that in your state!") - return 1 + return TRUE to_chat(user,"You begin to push [M] to freedom!") to_chat(M,"[usr] begins to push you to freedom!") @@ -403,11 +420,11 @@ if("Devour") //Eat the inside mob if(user.absorbed || user.stat) to_chat(user,"You can't do that in your state!") - return 1 + return TRUE if(!user.vore_selected) to_chat(user,"Pick a belly on yourself first!") - return 1 + return TRUE var/obj/belly/TB = user.vore_selected to_chat(user,"You begin to [lowertext(TB.vore_verb)] [M] into your [lowertext(TB.name)]!") @@ -425,7 +442,7 @@ var/obj/item/T = tgt if(!(tgt in OB)) //Doesn't exist anymore, update. - return 1 + return TRUE intent = alert("What do you want to do to that?","Query","Examine","Use Hand") switch(intent) if("Examine") @@ -434,7 +451,7 @@ if("Use Hand") if(user.stat) to_chat(user,"You can't do that in your state!") - return 1 + return TRUE user.ClickOn(T) sleep(5) //Seems to exit too fast for the panel to update @@ -447,23 +464,23 @@ intent = alert("Eject all, Move all?","Query","Eject all","Cancel","Move all") switch(intent) if("Cancel") - return 0 + return FALSE if("Eject all") if(user.stat) to_chat(user,"You can't do that in your state!") - return 0 + return FALSE selected.release_all_contents() if("Move all") if(user.stat) to_chat(user,"You can't do that in your state!") - return 0 + return FALSE var/obj/belly/choice = input("Move all where?","Select Belly") as null|anything in user.vore_organs if(!choice) - return 0 + return FALSE for(var/atom/movable/tgt in selected) to_chat(tgt,"You're squished from [user]'s [lowertext(selected)] to their [lowertext(choice.name)]!") @@ -471,7 +488,7 @@ var/atom/movable/tgt = locate(href_list["insidepick"]) if(!(tgt in selected)) //Old menu, needs updating because they aren't really there. - return 1 //Forces update + return TRUE //Forces update intent = "Examine" intent = alert("Examine, Eject, Move? Examine if you want to leave this box.","Query","Examine","Eject","Move") switch(intent) @@ -481,25 +498,25 @@ if("Eject") if(user.stat) to_chat(user,"You can't do that in your state!") - return 0 + return FALSE selected.release_specific_contents(tgt) if("Move") if(user.stat) to_chat(user,"You can't do that in your state!") - return 0 + return FALSE var/obj/belly/choice = input("Move [tgt] where?","Select Belly") as null|anything in user.vore_organs if(!choice || !(tgt in selected)) - return 0 + return FALSE to_chat(tgt,"You're squished from [user]'s [lowertext(selected.name)] to their [lowertext(choice.name)]!") selected.transfer_contents(tgt, choice) if(href_list["newbelly"]) if(user.vore_organs.len >= BELLIES_MAX) - return 0 + return FALSE var/new_name = html_encode(input(usr,"New belly's name:","New Belly") as text|null) @@ -516,7 +533,7 @@ if(failure_msg) //Something went wrong. alert(user,failure_msg,"Error!") - return 0 + return FALSE var/obj/belly/NB = new(user) NB.name = new_name @@ -545,7 +562,7 @@ if(failure_msg) //Something went wrong. alert(user,failure_msg,"Error!") - return 0 + return FALSE selected.name = new_name @@ -562,13 +579,13 @@ var/new_mode = input("Choose Mode (currently [selected.digest_mode])") as null|anything in menu_list if(!new_mode) - return 0 + return FALSE if(new_mode == DM_TRANSFORM) //Snowflek submenu var/list/tf_list = selected.transform_modes var/new_tf_mode = input("Choose TF Mode (currently [selected.tf_mode])") as null|anything in tf_list if(!new_tf_mode) - return 0 + return FALSE selected.tf_mode = new_tf_mode selected.digest_mode = new_mode @@ -578,7 +595,7 @@ var/list/menu_list = selected.mode_flag_list.Copy() var/toggle_addon = input("Toggle Addon") as null|anything in menu_list if(!toggle_addon) - return 0 + return FALSE selected.mode_flags ^= selected.mode_flag_list[toggle_addon] selected.items_preserved.Cut() //Re-evaltuate all items in belly on addon toggle @@ -587,7 +604,7 @@ var/new_mode = input("Choose Mode (currently [selected.item_digest_mode])") as null|anything in menu_list if(!new_mode) - return 0 + return FALSE selected.item_digest_mode = new_mode selected.items_preserved.Cut() //Re-evaltuate all items in belly on belly-mode change @@ -599,14 +616,14 @@ var/list/menu_list = contamination_flavors.Copy() var/new_flavor = input("Choose Contamination Flavor Text Type (currently [selected.contamination_flavor])") as null|anything in menu_list if(!new_flavor) - return 0 + return FALSE selected.contamination_flavor = new_flavor if(href_list["b_contamination_color"]) var/list/menu_list = contamination_colors.Copy() var/new_color = input("Choose Contamination Color (currently [selected.contamination_color])") as null|anything in menu_list if(!new_color) - return 0 + return FALSE selected.contamination_color = new_color selected.items_preserved.Cut() //To re-contaminate for new color @@ -617,10 +634,10 @@ new_desc = readd_quotes(new_desc) if(length(new_desc) > BELLIES_DESC_MAX) alert("Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") - return 0 + return FALSE selected.desc = new_desc else //Returned null - return 0 + return FALSE if(href_list["b_msgs"]) var/list/messages = list( @@ -675,7 +692,7 @@ if(length(new_verb) > BELLIES_NAME_MAX || length(new_verb) < BELLIES_NAME_MIN) alert("Entered verb length invalid (must be longer than [BELLIES_NAME_MIN], no longer than [BELLIES_NAME_MAX]).","Error") - return 0 + return FALSE selected.vore_verb = new_verb @@ -800,7 +817,7 @@ var/obj/belly/choice = input("Where do you want your [lowertext(selected.name)] to lead if prey resists?","Select Belly") as null|anything in (user.vore_organs + "None - Remove" - selected) if(!choice) //They cancelled, no changes - return 0 + return FALSE else if(choice == "None - Remove") selected.transferlocation = null else @@ -819,7 +836,7 @@ if(href_list["b_del"]) var/alert = alert("Are you sure you want to delete your [lowertext(selected.name)]?","Confirmation","Delete","Cancel") if(!(alert == "Delete")) - return 0 + return FALSE var/failure_msg = "" @@ -840,7 +857,7 @@ if(failure_msg) alert(user,failure_msg,"Error!") - return 0 + return FALSE qdel(selected) selected = user.vore_organs[1] @@ -855,7 +872,7 @@ if(href_list["applyprefs"]) var/alert = alert("Are you sure you want to reload character slot preferences? This will remove your current vore organs and eject their contents.","Confirmation","Reload","Cancel") if(!alert == "Reload") - return 0 + return FALSE if(!user.apply_vore_prefs()) alert("ERROR: Virgo-specific preferences failed to apply!","Error") else @@ -864,29 +881,29 @@ if(href_list["setflavor"]) var/new_flavor = html_encode(input(usr,"What your character tastes like (40ch limit). This text will be printed to the pred after 'X tastes of...' so just put something like 'strawberries and cream':","Character Flavor",user.vore_taste) as text|null) if(!new_flavor) - return 0 + return FALSE new_flavor = readd_quotes(new_flavor) if(length(new_flavor) > FLAVOR_MAX) alert("Entered flavor/taste text too long. [FLAVOR_MAX] character limit.","Error!") - return 0 + return FALSE user.vore_taste = new_flavor if(href_list["toggle_dropnom_pred"]) - var/choice = alert(user, "You are currently [user.can_be_drop_pred ? " able to eat prey that fall from above or that you fall onto" : "not able to eat prey that fall from above or that you fall onto."]", "", "Be Pred", "Cancel", "Don't be Pred") + var/choice = alert(user, "This toggle is for spontaneous, environment related vore as a predator, including drop-noms, teleporters, etc. You are currently [user.can_be_drop_pred ? " able to eat prey that you encounter by environmental actions." : "avoiding eating prey encountered in the environment."]", "", "Be Pred", "Cancel", "Don't be Pred") switch(choice) if("Cancel") - return 0 + return FALSE if("Be Pred") user.can_be_drop_pred = TRUE if("Don't be Pred") user.can_be_drop_pred = FALSE if(href_list["toggle_dropnom_prey"]) - var/choice = alert(user, "You are currently [user.can_be_drop_prey ? "able to be eaten." : "not able to be eaten."]", "", "Be Prey", "Cancel", "Don't Be Prey") + var/choice = alert(user, "This toggle is for spontaneous, environment related vore as a prey, including drop-noms, teleporters, etc. You are currently [user.can_be_drop_prey ? "able to be eaten by environmental actions." : "not able to be eaten by environmental actions."]", "", "Be Prey", "Cancel", "Don't Be Prey") switch(choice) if("Cancel") - return 0 + return FALSE if("Be Prey") user.can_be_drop_prey = TRUE if("Don't Be Prey") @@ -896,7 +913,7 @@ var/choice = alert(user, "This button is for those who don't like being digested. It can make you undigestable. Messages admins when changed, so don't try to use it for mechanical benefit. Set it once and save it. Digesting you is currently: [user.digestable ? "Allowed" : "Prevented"]", "", "Allow Digestion", "Cancel", "Prevent Digestion") switch(choice) if("Cancel") - return 0 + return FALSE if("Allow Digestion") user.digestable = TRUE if("Prevent Digestion") @@ -907,11 +924,37 @@ if(user.client.prefs_vr) user.client.prefs_vr.digestable = user.digestable + if(href_list["toggleddevour"]) + var/choice = alert(user, "This button is to toggle your ability to be devoured by others. Devouring is currently: [user.devourable ? "Allowed" : "Prevented"]", "", "Be Devourable", "Cancel", "Prevent being Devoured") + switch(choice) + if("Cancel") + return FALSE + if("Be Devourable") + user.devourable = TRUE + if("Prevent being Devoured") + user.devourable = FALSE + + if(user.client.prefs_vr) + user.client.prefs_vr.devourable = user.devourable + + if(href_list["toggledfeed"]) + var/choice = alert(user, "This button is to toggle your ability to be fed to or by others vorishly. Force Feeding is currently: [user.feeding ? "Allowed" : "Prevented"]", "", "Allow Feeding", "Cancel", "Prevent Feeding") + switch(choice) + if("Cancel") + return FALSE + if("Allow Feeding") + user.feeding = TRUE + if("Prevent Feeding") + user.feeding = FALSE + + if(user.client.prefs_vr) + user.client.prefs_vr.feeding = user.feeding + if(href_list["toggledlm"]) var/choice = alert(user, "This button allows preds to have your remains be left in their belly after you are digested. This will only happen if pred sets their belly to do so. Remains consist of skeletal parts. Currently you are [user.digest_leave_remains? "" : "not"] leaving remains.", "", "Allow Post-digestion Remains", "Cancel", "Disallow Post-digestion Remains") switch(choice) if("Cancel") - return 0 + return FALSE if("Allow Post-digestion Remains") user.digest_leave_remains = TRUE if("Disallow Post-digestion Remains") @@ -924,7 +967,7 @@ var/choice = alert(user, "This button is for those who don't like being eaten by mobs. Messages admins when changed, so don't try to use it for mechanical benefit. Set it once and save it. Mobs are currently: [user.allowmobvore ? "Allowed to eat" : "Prevented from eating"] you.", "", "Allow Mob Predation", "Cancel", "Prevent Mob Predation") switch(choice) if("Cancel") - return 0 + return FALSE if("Allow Mob Predation") user.allowmobvore = TRUE if("Prevent Mob Predation") @@ -939,7 +982,7 @@ var/choice = alert(user, "This button is for those who don't like healbelly used on them as a mechanic. It does not affect anything, but is displayed under mechanical prefs for ease of quick checks. You are currently: [user.allowmobvore ? "Okay" : "Not Okay"] with players using healbelly on you.", "", "Allow Healing Belly", "Cancel", "Disallow Healing Belly") switch(choice) if("Cancel") - return 0 + return FALSE if("Allow Healing Belly") user.permit_healbelly = TRUE if("Disallow Healing Belly") @@ -952,11 +995,11 @@ var/choice = alert(user, "Toggle audible hunger noises. Currently: [user.noisy ? "Enabled" : "Disabled"]", "", "Enable audible hunger", "Cancel", "Disable audible hunger") switch(choice) if("Cancel") - return 0 + return FALSE if("Enable audible hunger") user.noisy = TRUE if("Disable audible hunger") user.noisy = FALSE //Refresh when interacted with, returning 1 makes vore_look.Topic update - return 1 + return TRUE diff --git a/html/changelogs/Poojawa - devourfeedprefs.yml b/html/changelogs/Poojawa - devourfeedprefs.yml new file mode 100644 index 0000000000..5fe418cc80 --- /dev/null +++ b/html/changelogs/Poojawa - devourfeedprefs.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Poojawa + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Applies Feeding and Devourable prefs." + - bugfix: "Made VoreUI toggles a lot more clear of what mode they're in." \ No newline at end of file diff --git a/sound/vore/sunesound/pred/death_01.ogg b/sound/vore/sunesound/pred/death_01.ogg index 63ace65beb..231884ef54 100644 Binary files a/sound/vore/sunesound/pred/death_01.ogg and b/sound/vore/sunesound/pred/death_01.ogg differ diff --git a/sound/vore/sunesound/pred/death_02.ogg b/sound/vore/sunesound/pred/death_02.ogg index 4185f6fb20..5de3e4148c 100644 Binary files a/sound/vore/sunesound/pred/death_02.ogg and b/sound/vore/sunesound/pred/death_02.ogg differ diff --git a/sound/vore/sunesound/pred/death_03.ogg b/sound/vore/sunesound/pred/death_03.ogg index a9e5d769df..4ffa271af7 100644 Binary files a/sound/vore/sunesound/pred/death_03.ogg and b/sound/vore/sunesound/pred/death_03.ogg differ diff --git a/sound/vore/sunesound/pred/death_04.ogg b/sound/vore/sunesound/pred/death_04.ogg index 4deb6d5ec8..a4c0e91be6 100644 Binary files a/sound/vore/sunesound/pred/death_04.ogg and b/sound/vore/sunesound/pred/death_04.ogg differ diff --git a/sound/vore/sunesound/pred/death_05.ogg b/sound/vore/sunesound/pred/death_05.ogg index 9c359627c3..aeec557758 100644 Binary files a/sound/vore/sunesound/pred/death_05.ogg and b/sound/vore/sunesound/pred/death_05.ogg differ diff --git a/sound/vore/sunesound/pred/death_06.ogg b/sound/vore/sunesound/pred/death_06.ogg index 3d0fd0f58c..f5b077ebd4 100644 Binary files a/sound/vore/sunesound/pred/death_06.ogg and b/sound/vore/sunesound/pred/death_06.ogg differ diff --git a/sound/vore/sunesound/pred/death_07.ogg b/sound/vore/sunesound/pred/death_07.ogg index 98454abac9..afaaab65bb 100644 Binary files a/sound/vore/sunesound/pred/death_07.ogg and b/sound/vore/sunesound/pred/death_07.ogg differ diff --git a/sound/vore/sunesound/pred/death_08.ogg b/sound/vore/sunesound/pred/death_08.ogg index 068d6b8355..b1b8479ea8 100644 Binary files a/sound/vore/sunesound/pred/death_08.ogg and b/sound/vore/sunesound/pred/death_08.ogg differ diff --git a/sound/vore/sunesound/pred/death_09.ogg b/sound/vore/sunesound/pred/death_09.ogg index a4ad821c16..1454deafad 100644 Binary files a/sound/vore/sunesound/pred/death_09.ogg and b/sound/vore/sunesound/pred/death_09.ogg differ diff --git a/sound/vore/sunesound/pred/death_10.ogg b/sound/vore/sunesound/pred/death_10.ogg index b67868442f..f0e23e1d54 100644 Binary files a/sound/vore/sunesound/pred/death_10.ogg and b/sound/vore/sunesound/pred/death_10.ogg differ diff --git a/sound/vore/sunesound/pred/death_11.ogg b/sound/vore/sunesound/pred/death_11.ogg index db125edf80..43e80467e0 100644 Binary files a/sound/vore/sunesound/pred/death_11.ogg and b/sound/vore/sunesound/pred/death_11.ogg differ diff --git a/sound/vore/sunesound/pred/death_12.ogg b/sound/vore/sunesound/pred/death_12.ogg index ab4c548744..5ec6029998 100644 Binary files a/sound/vore/sunesound/pred/death_12.ogg and b/sound/vore/sunesound/pred/death_12.ogg differ diff --git a/sound/vore/sunesound/pred/death_13.ogg b/sound/vore/sunesound/pred/death_13.ogg index 008941942f..9073bac4f2 100644 Binary files a/sound/vore/sunesound/pred/death_13.ogg and b/sound/vore/sunesound/pred/death_13.ogg differ diff --git a/sound/vore/sunesound/pred/digest_01.ogg b/sound/vore/sunesound/pred/digest_01.ogg index 09e6805e90..20b6d1d43a 100644 Binary files a/sound/vore/sunesound/pred/digest_01.ogg and b/sound/vore/sunesound/pred/digest_01.ogg differ diff --git a/sound/vore/sunesound/pred/digest_02.ogg b/sound/vore/sunesound/pred/digest_02.ogg index d6852aeb9a..7fc41e2305 100644 Binary files a/sound/vore/sunesound/pred/digest_02.ogg and b/sound/vore/sunesound/pred/digest_02.ogg differ diff --git a/sound/vore/sunesound/pred/digest_03.ogg b/sound/vore/sunesound/pred/digest_03.ogg index 9e85de831e..98b032c7cb 100644 Binary files a/sound/vore/sunesound/pred/digest_03.ogg and b/sound/vore/sunesound/pred/digest_03.ogg differ diff --git a/sound/vore/sunesound/pred/digest_04.ogg b/sound/vore/sunesound/pred/digest_04.ogg index b35da498d3..ed494e813c 100644 Binary files a/sound/vore/sunesound/pred/digest_04.ogg and b/sound/vore/sunesound/pred/digest_04.ogg differ diff --git a/sound/vore/sunesound/pred/digest_05.ogg b/sound/vore/sunesound/pred/digest_05.ogg index 60ea067a91..53bb4814f7 100644 Binary files a/sound/vore/sunesound/pred/digest_05.ogg and b/sound/vore/sunesound/pred/digest_05.ogg differ diff --git a/sound/vore/sunesound/pred/digest_06.ogg b/sound/vore/sunesound/pred/digest_06.ogg index 4dcf50b699..787c336282 100644 Binary files a/sound/vore/sunesound/pred/digest_06.ogg and b/sound/vore/sunesound/pred/digest_06.ogg differ diff --git a/sound/vore/sunesound/pred/digest_07.ogg b/sound/vore/sunesound/pred/digest_07.ogg index 4d8fefd100..f63d4c633a 100644 Binary files a/sound/vore/sunesound/pred/digest_07.ogg and b/sound/vore/sunesound/pred/digest_07.ogg differ diff --git a/sound/vore/sunesound/pred/digest_08.ogg b/sound/vore/sunesound/pred/digest_08.ogg index da8b3fa963..dbbda3b517 100644 Binary files a/sound/vore/sunesound/pred/digest_08.ogg and b/sound/vore/sunesound/pred/digest_08.ogg differ diff --git a/sound/vore/sunesound/pred/digest_09.ogg b/sound/vore/sunesound/pred/digest_09.ogg index 072efb17fb..1877f1ca05 100644 Binary files a/sound/vore/sunesound/pred/digest_09.ogg and b/sound/vore/sunesound/pred/digest_09.ogg differ diff --git a/sound/vore/sunesound/pred/digest_10.ogg b/sound/vore/sunesound/pred/digest_10.ogg index fb69e4fd1a..3e22b8b2fb 100644 Binary files a/sound/vore/sunesound/pred/digest_10.ogg and b/sound/vore/sunesound/pred/digest_10.ogg differ diff --git a/sound/vore/sunesound/pred/digest_11.ogg b/sound/vore/sunesound/pred/digest_11.ogg index 611882b6d3..089d4ee7e4 100644 Binary files a/sound/vore/sunesound/pred/digest_11.ogg and b/sound/vore/sunesound/pred/digest_11.ogg differ diff --git a/sound/vore/sunesound/pred/digest_12.ogg b/sound/vore/sunesound/pred/digest_12.ogg index c9e004afb7..76a9134646 100644 Binary files a/sound/vore/sunesound/pred/digest_12.ogg and b/sound/vore/sunesound/pred/digest_12.ogg differ diff --git a/sound/vore/sunesound/pred/digest_13.ogg b/sound/vore/sunesound/pred/digest_13.ogg index 45a9d59f52..12b1c6bb18 100644 Binary files a/sound/vore/sunesound/pred/digest_13.ogg and b/sound/vore/sunesound/pred/digest_13.ogg differ diff --git a/sound/vore/sunesound/pred/digest_14.ogg b/sound/vore/sunesound/pred/digest_14.ogg index 9815d172ca..c68231585c 100644 Binary files a/sound/vore/sunesound/pred/digest_14.ogg and b/sound/vore/sunesound/pred/digest_14.ogg differ diff --git a/sound/vore/sunesound/pred/digest_15.ogg b/sound/vore/sunesound/pred/digest_15.ogg index d2e44ecc86..32aecca35b 100644 Binary files a/sound/vore/sunesound/pred/digest_15.ogg and b/sound/vore/sunesound/pred/digest_15.ogg differ diff --git a/sound/vore/sunesound/pred/digest_16.ogg b/sound/vore/sunesound/pred/digest_16.ogg index 84faa4bd99..d112913570 100644 Binary files a/sound/vore/sunesound/pred/digest_16.ogg and b/sound/vore/sunesound/pred/digest_16.ogg differ diff --git a/sound/vore/sunesound/pred/digest_17.ogg b/sound/vore/sunesound/pred/digest_17.ogg index 0dd6fd4989..d23c4c6ddc 100644 Binary files a/sound/vore/sunesound/pred/digest_17.ogg and b/sound/vore/sunesound/pred/digest_17.ogg differ diff --git a/sound/vore/sunesound/pred/digest_18.ogg b/sound/vore/sunesound/pred/digest_18.ogg index a9fa5b51f9..ae8ac9f74f 100644 Binary files a/sound/vore/sunesound/pred/digest_18.ogg and b/sound/vore/sunesound/pred/digest_18.ogg differ diff --git a/sound/vore/sunesound/pred/escape.ogg b/sound/vore/sunesound/pred/escape.ogg index a823fc1284..fc093a5acf 100644 Binary files a/sound/vore/sunesound/pred/escape.ogg and b/sound/vore/sunesound/pred/escape.ogg differ diff --git a/sound/vore/sunesound/pred/insertion_01.ogg b/sound/vore/sunesound/pred/insertion_01.ogg index 6a8e7e3ff0..4ca8b6e425 100644 Binary files a/sound/vore/sunesound/pred/insertion_01.ogg and b/sound/vore/sunesound/pred/insertion_01.ogg differ diff --git a/sound/vore/sunesound/pred/insertion_02.ogg b/sound/vore/sunesound/pred/insertion_02.ogg index c6e4f96d94..a23cfaf201 100644 Binary files a/sound/vore/sunesound/pred/insertion_02.ogg and b/sound/vore/sunesound/pred/insertion_02.ogg differ diff --git a/sound/vore/sunesound/pred/loop.ogg b/sound/vore/sunesound/pred/loop.ogg index afd6e6003d..5f0994251a 100644 Binary files a/sound/vore/sunesound/pred/loop.ogg and b/sound/vore/sunesound/pred/loop.ogg differ diff --git a/sound/vore/sunesound/pred/schlorp.ogg b/sound/vore/sunesound/pred/schlorp.ogg index c9cd5a3413..eefb9dd71e 100644 Binary files a/sound/vore/sunesound/pred/schlorp.ogg and b/sound/vore/sunesound/pred/schlorp.ogg differ diff --git a/sound/vore/sunesound/pred/squish _02.ogg b/sound/vore/sunesound/pred/squish _02.ogg index 2e3effb4d7..846f0a2ece 100644 Binary files a/sound/vore/sunesound/pred/squish _02.ogg and b/sound/vore/sunesound/pred/squish _02.ogg differ diff --git a/sound/vore/sunesound/pred/squish _03.ogg b/sound/vore/sunesound/pred/squish _03.ogg index 24b5f9ce02..568aa81a3d 100644 Binary files a/sound/vore/sunesound/pred/squish _03.ogg and b/sound/vore/sunesound/pred/squish _03.ogg differ diff --git a/sound/vore/sunesound/pred/squish_01.ogg b/sound/vore/sunesound/pred/squish_01.ogg index 17dc83ed98..bc014b811d 100644 Binary files a/sound/vore/sunesound/pred/squish_01.ogg and b/sound/vore/sunesound/pred/squish_01.ogg differ diff --git a/sound/vore/sunesound/pred/squish_02.ogg b/sound/vore/sunesound/pred/squish_02.ogg index febc4c106e..8d92bfd19e 100644 Binary files a/sound/vore/sunesound/pred/squish_02.ogg and b/sound/vore/sunesound/pred/squish_02.ogg differ diff --git a/sound/vore/sunesound/pred/squish_03.ogg b/sound/vore/sunesound/pred/squish_03.ogg index c1b544806b..f62bf7ff60 100644 Binary files a/sound/vore/sunesound/pred/squish_03.ogg and b/sound/vore/sunesound/pred/squish_03.ogg differ diff --git a/sound/vore/sunesound/pred/squish_04.ogg b/sound/vore/sunesound/pred/squish_04.ogg index e764ba051b..47037d9a3a 100644 Binary files a/sound/vore/sunesound/pred/squish_04.ogg and b/sound/vore/sunesound/pred/squish_04.ogg differ diff --git a/sound/vore/sunesound/pred/stomachmove.ogg b/sound/vore/sunesound/pred/stomachmove.ogg index 3a9ed98dae..4e11cc03ed 100644 Binary files a/sound/vore/sunesound/pred/stomachmove.ogg and b/sound/vore/sunesound/pred/stomachmove.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_01.ogg b/sound/vore/sunesound/pred/struggle_01.ogg index aea5581889..96c569b0f9 100644 Binary files a/sound/vore/sunesound/pred/struggle_01.ogg and b/sound/vore/sunesound/pred/struggle_01.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_02.ogg b/sound/vore/sunesound/pred/struggle_02.ogg index 526abd0a9e..2f0d3324f1 100644 Binary files a/sound/vore/sunesound/pred/struggle_02.ogg and b/sound/vore/sunesound/pred/struggle_02.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_03.ogg b/sound/vore/sunesound/pred/struggle_03.ogg index f3300a8bf3..9632817010 100644 Binary files a/sound/vore/sunesound/pred/struggle_03.ogg and b/sound/vore/sunesound/pred/struggle_03.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_04.ogg b/sound/vore/sunesound/pred/struggle_04.ogg index 9efa23eaa9..7a30de3baf 100644 Binary files a/sound/vore/sunesound/pred/struggle_04.ogg and b/sound/vore/sunesound/pred/struggle_04.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_05.ogg b/sound/vore/sunesound/pred/struggle_05.ogg index ec4d006880..0bae93d50f 100644 Binary files a/sound/vore/sunesound/pred/struggle_05.ogg and b/sound/vore/sunesound/pred/struggle_05.ogg differ diff --git a/sound/vore/sunesound/pred/swallow_01.ogg b/sound/vore/sunesound/pred/swallow_01.ogg index 1767daf0e8..45a0008586 100644 Binary files a/sound/vore/sunesound/pred/swallow_01.ogg and b/sound/vore/sunesound/pred/swallow_01.ogg differ diff --git a/sound/vore/sunesound/pred/swallow_02.ogg b/sound/vore/sunesound/pred/swallow_02.ogg index dd906bfad8..8f9bcb2e84 100644 Binary files a/sound/vore/sunesound/pred/swallow_02.ogg and b/sound/vore/sunesound/pred/swallow_02.ogg differ diff --git a/sound/vore/sunesound/pred/taurswallow.ogg b/sound/vore/sunesound/pred/taurswallow.ogg index 697947fb49..c700f71803 100644 Binary files a/sound/vore/sunesound/pred/taurswallow.ogg and b/sound/vore/sunesound/pred/taurswallow.ogg differ diff --git a/sound/vore/sunesound/prey/death_01.ogg b/sound/vore/sunesound/prey/death_01.ogg index fb73f520d8..539a873a7e 100644 Binary files a/sound/vore/sunesound/prey/death_01.ogg and b/sound/vore/sunesound/prey/death_01.ogg differ diff --git a/sound/vore/sunesound/prey/death_02.ogg b/sound/vore/sunesound/prey/death_02.ogg index 96a4004691..4dd1a285ea 100644 Binary files a/sound/vore/sunesound/prey/death_02.ogg and b/sound/vore/sunesound/prey/death_02.ogg differ diff --git a/sound/vore/sunesound/prey/death_03.ogg b/sound/vore/sunesound/prey/death_03.ogg index faae0c0cad..30a3622c86 100644 Binary files a/sound/vore/sunesound/prey/death_03.ogg and b/sound/vore/sunesound/prey/death_03.ogg differ diff --git a/sound/vore/sunesound/prey/death_04.ogg b/sound/vore/sunesound/prey/death_04.ogg index 7a7230e11c..ff983c2c31 100644 Binary files a/sound/vore/sunesound/prey/death_04.ogg and b/sound/vore/sunesound/prey/death_04.ogg differ diff --git a/sound/vore/sunesound/prey/death_05.ogg b/sound/vore/sunesound/prey/death_05.ogg index 91e351a62c..44b8603048 100644 Binary files a/sound/vore/sunesound/prey/death_05.ogg and b/sound/vore/sunesound/prey/death_05.ogg differ diff --git a/sound/vore/sunesound/prey/death_06.ogg b/sound/vore/sunesound/prey/death_06.ogg index 59f5f5cde9..836a4fd18c 100644 Binary files a/sound/vore/sunesound/prey/death_06.ogg and b/sound/vore/sunesound/prey/death_06.ogg differ diff --git a/sound/vore/sunesound/prey/death_07.ogg b/sound/vore/sunesound/prey/death_07.ogg index 6a8ef68561..2406fea727 100644 Binary files a/sound/vore/sunesound/prey/death_07.ogg and b/sound/vore/sunesound/prey/death_07.ogg differ diff --git a/sound/vore/sunesound/prey/death_08.ogg b/sound/vore/sunesound/prey/death_08.ogg index 1991706d94..0d7627dfae 100644 Binary files a/sound/vore/sunesound/prey/death_08.ogg and b/sound/vore/sunesound/prey/death_08.ogg differ diff --git a/sound/vore/sunesound/prey/death_09.ogg b/sound/vore/sunesound/prey/death_09.ogg index c209e5f112..fa00a29d31 100644 Binary files a/sound/vore/sunesound/prey/death_09.ogg and b/sound/vore/sunesound/prey/death_09.ogg differ diff --git a/sound/vore/sunesound/prey/death_10.ogg b/sound/vore/sunesound/prey/death_10.ogg index ccf51389f1..738e7cf909 100644 Binary files a/sound/vore/sunesound/prey/death_10.ogg and b/sound/vore/sunesound/prey/death_10.ogg differ diff --git a/sound/vore/sunesound/prey/death_11.ogg b/sound/vore/sunesound/prey/death_11.ogg index b8089d0d88..bfd47945ae 100644 Binary files a/sound/vore/sunesound/prey/death_11.ogg and b/sound/vore/sunesound/prey/death_11.ogg differ diff --git a/sound/vore/sunesound/prey/death_12.ogg b/sound/vore/sunesound/prey/death_12.ogg index b39a17b9aa..e6e800b2da 100644 Binary files a/sound/vore/sunesound/prey/death_12.ogg and b/sound/vore/sunesound/prey/death_12.ogg differ diff --git a/sound/vore/sunesound/prey/death_13.ogg b/sound/vore/sunesound/prey/death_13.ogg index 375e1ec72f..c9b79887d7 100644 Binary files a/sound/vore/sunesound/prey/death_13.ogg and b/sound/vore/sunesound/prey/death_13.ogg differ diff --git a/sound/vore/sunesound/prey/digest_01.ogg b/sound/vore/sunesound/prey/digest_01.ogg index 0340773865..a1d13f7fb7 100644 Binary files a/sound/vore/sunesound/prey/digest_01.ogg and b/sound/vore/sunesound/prey/digest_01.ogg differ diff --git a/sound/vore/sunesound/prey/digest_02.ogg b/sound/vore/sunesound/prey/digest_02.ogg index 837e894f80..443d23c194 100644 Binary files a/sound/vore/sunesound/prey/digest_02.ogg and b/sound/vore/sunesound/prey/digest_02.ogg differ diff --git a/sound/vore/sunesound/prey/digest_03.ogg b/sound/vore/sunesound/prey/digest_03.ogg index 6f5db33b78..eb798b66ff 100644 Binary files a/sound/vore/sunesound/prey/digest_03.ogg and b/sound/vore/sunesound/prey/digest_03.ogg differ diff --git a/sound/vore/sunesound/prey/digest_04.ogg b/sound/vore/sunesound/prey/digest_04.ogg index b4184cd2a9..a2c2c3e1ac 100644 Binary files a/sound/vore/sunesound/prey/digest_04.ogg and b/sound/vore/sunesound/prey/digest_04.ogg differ diff --git a/sound/vore/sunesound/prey/digest_05.ogg b/sound/vore/sunesound/prey/digest_05.ogg index 79209df1f5..752a6d48f3 100644 Binary files a/sound/vore/sunesound/prey/digest_05.ogg and b/sound/vore/sunesound/prey/digest_05.ogg differ diff --git a/sound/vore/sunesound/prey/digest_06.ogg b/sound/vore/sunesound/prey/digest_06.ogg index 193167c50d..f2e80b919f 100644 Binary files a/sound/vore/sunesound/prey/digest_06.ogg and b/sound/vore/sunesound/prey/digest_06.ogg differ diff --git a/sound/vore/sunesound/prey/digest_07.ogg b/sound/vore/sunesound/prey/digest_07.ogg index 1092c3d5e0..6a2ff70ff8 100644 Binary files a/sound/vore/sunesound/prey/digest_07.ogg and b/sound/vore/sunesound/prey/digest_07.ogg differ diff --git a/sound/vore/sunesound/prey/digest_08.ogg b/sound/vore/sunesound/prey/digest_08.ogg index ef6aa1dcab..4e55f4671d 100644 Binary files a/sound/vore/sunesound/prey/digest_08.ogg and b/sound/vore/sunesound/prey/digest_08.ogg differ diff --git a/sound/vore/sunesound/prey/digest_09.ogg b/sound/vore/sunesound/prey/digest_09.ogg index db0a07d2b8..452e6b4a2e 100644 Binary files a/sound/vore/sunesound/prey/digest_09.ogg and b/sound/vore/sunesound/prey/digest_09.ogg differ diff --git a/sound/vore/sunesound/prey/digest_10.ogg b/sound/vore/sunesound/prey/digest_10.ogg index 788350acc6..4c5dc2e333 100644 Binary files a/sound/vore/sunesound/prey/digest_10.ogg and b/sound/vore/sunesound/prey/digest_10.ogg differ diff --git a/sound/vore/sunesound/prey/digest_11.ogg b/sound/vore/sunesound/prey/digest_11.ogg index 9f00271cd3..e94c0af656 100644 Binary files a/sound/vore/sunesound/prey/digest_11.ogg and b/sound/vore/sunesound/prey/digest_11.ogg differ diff --git a/sound/vore/sunesound/prey/digest_12.ogg b/sound/vore/sunesound/prey/digest_12.ogg index 4a7e360688..cb212fed1c 100644 Binary files a/sound/vore/sunesound/prey/digest_12.ogg and b/sound/vore/sunesound/prey/digest_12.ogg differ diff --git a/sound/vore/sunesound/prey/digest_13.ogg b/sound/vore/sunesound/prey/digest_13.ogg index 890c65ab08..9fd292184e 100644 Binary files a/sound/vore/sunesound/prey/digest_13.ogg and b/sound/vore/sunesound/prey/digest_13.ogg differ diff --git a/sound/vore/sunesound/prey/digest_14.ogg b/sound/vore/sunesound/prey/digest_14.ogg index de54440ea5..24279d4712 100644 Binary files a/sound/vore/sunesound/prey/digest_14.ogg and b/sound/vore/sunesound/prey/digest_14.ogg differ diff --git a/sound/vore/sunesound/prey/digest_15.ogg b/sound/vore/sunesound/prey/digest_15.ogg index 52ad557e84..2bf555ba41 100644 Binary files a/sound/vore/sunesound/prey/digest_15.ogg and b/sound/vore/sunesound/prey/digest_15.ogg differ diff --git a/sound/vore/sunesound/prey/digest_16.ogg b/sound/vore/sunesound/prey/digest_16.ogg index f2ff139651..98edd6fb61 100644 Binary files a/sound/vore/sunesound/prey/digest_16.ogg and b/sound/vore/sunesound/prey/digest_16.ogg differ diff --git a/sound/vore/sunesound/prey/digest_17.ogg b/sound/vore/sunesound/prey/digest_17.ogg index fa8ac42ae4..2ff5c173e1 100644 Binary files a/sound/vore/sunesound/prey/digest_17.ogg and b/sound/vore/sunesound/prey/digest_17.ogg differ diff --git a/sound/vore/sunesound/prey/digest_18.ogg b/sound/vore/sunesound/prey/digest_18.ogg index f6fa631ad3..6a1ae78fb8 100644 Binary files a/sound/vore/sunesound/prey/digest_18.ogg and b/sound/vore/sunesound/prey/digest_18.ogg differ diff --git a/sound/vore/sunesound/prey/escape.ogg b/sound/vore/sunesound/prey/escape.ogg index 9947f53013..621997a56d 100644 Binary files a/sound/vore/sunesound/prey/escape.ogg and b/sound/vore/sunesound/prey/escape.ogg differ diff --git a/sound/vore/sunesound/prey/insertion_01.ogg b/sound/vore/sunesound/prey/insertion_01.ogg index e8ec89cd9e..5a3b942bb3 100644 Binary files a/sound/vore/sunesound/prey/insertion_01.ogg and b/sound/vore/sunesound/prey/insertion_01.ogg differ diff --git a/sound/vore/sunesound/prey/insertion_02.ogg b/sound/vore/sunesound/prey/insertion_02.ogg index e21b6b23e8..2d35094522 100644 Binary files a/sound/vore/sunesound/prey/insertion_02.ogg and b/sound/vore/sunesound/prey/insertion_02.ogg differ diff --git a/sound/vore/sunesound/prey/loop.ogg b/sound/vore/sunesound/prey/loop.ogg index a6a040e501..1584482d92 100644 Binary files a/sound/vore/sunesound/prey/loop.ogg and b/sound/vore/sunesound/prey/loop.ogg differ diff --git a/sound/vore/sunesound/prey/schlorp.ogg b/sound/vore/sunesound/prey/schlorp.ogg index c9cd5a3413..d1895ee26a 100644 Binary files a/sound/vore/sunesound/prey/schlorp.ogg and b/sound/vore/sunesound/prey/schlorp.ogg differ diff --git a/sound/vore/sunesound/prey/squish_01.ogg b/sound/vore/sunesound/prey/squish_01.ogg index d1b3285381..2785a4a080 100644 Binary files a/sound/vore/sunesound/prey/squish_01.ogg and b/sound/vore/sunesound/prey/squish_01.ogg differ diff --git a/sound/vore/sunesound/prey/squish_02.ogg b/sound/vore/sunesound/prey/squish_02.ogg index f754a258f4..f5671f7165 100644 Binary files a/sound/vore/sunesound/prey/squish_02.ogg and b/sound/vore/sunesound/prey/squish_02.ogg differ diff --git a/sound/vore/sunesound/prey/squish_03.ogg b/sound/vore/sunesound/prey/squish_03.ogg index 9a01dcd2e9..1e8f2bb896 100644 Binary files a/sound/vore/sunesound/prey/squish_03.ogg and b/sound/vore/sunesound/prey/squish_03.ogg differ diff --git a/sound/vore/sunesound/prey/squish_04.ogg b/sound/vore/sunesound/prey/squish_04.ogg index d7c96b5bee..2e618890a9 100644 Binary files a/sound/vore/sunesound/prey/squish_04.ogg and b/sound/vore/sunesound/prey/squish_04.ogg differ diff --git a/sound/vore/sunesound/prey/stomachmove.ogg b/sound/vore/sunesound/prey/stomachmove.ogg index 1a32c7a217..e4e004b072 100644 Binary files a/sound/vore/sunesound/prey/stomachmove.ogg and b/sound/vore/sunesound/prey/stomachmove.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_01.ogg b/sound/vore/sunesound/prey/struggle_01.ogg index ca90ed4f19..de0f3ad8bd 100644 Binary files a/sound/vore/sunesound/prey/struggle_01.ogg and b/sound/vore/sunesound/prey/struggle_01.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_02.ogg b/sound/vore/sunesound/prey/struggle_02.ogg index 711c488db2..2695ab0adf 100644 Binary files a/sound/vore/sunesound/prey/struggle_02.ogg and b/sound/vore/sunesound/prey/struggle_02.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_03.ogg b/sound/vore/sunesound/prey/struggle_03.ogg index d7e4e5f0bb..17dd8bec8a 100644 Binary files a/sound/vore/sunesound/prey/struggle_03.ogg and b/sound/vore/sunesound/prey/struggle_03.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_04.ogg b/sound/vore/sunesound/prey/struggle_04.ogg index 4e6532a0fc..8631853509 100644 Binary files a/sound/vore/sunesound/prey/struggle_04.ogg and b/sound/vore/sunesound/prey/struggle_04.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_05.ogg b/sound/vore/sunesound/prey/struggle_05.ogg index 6399d69adc..233addec0b 100644 Binary files a/sound/vore/sunesound/prey/struggle_05.ogg and b/sound/vore/sunesound/prey/struggle_05.ogg differ diff --git a/sound/vore/sunesound/prey/swallow_01.ogg b/sound/vore/sunesound/prey/swallow_01.ogg index 86e14ef7af..3da3fef66a 100644 Binary files a/sound/vore/sunesound/prey/swallow_01.ogg and b/sound/vore/sunesound/prey/swallow_01.ogg differ diff --git a/sound/vore/sunesound/prey/swallow_02.ogg b/sound/vore/sunesound/prey/swallow_02.ogg index dbfad7750a..30d9a4e44d 100644 Binary files a/sound/vore/sunesound/prey/swallow_02.ogg and b/sound/vore/sunesound/prey/swallow_02.ogg differ diff --git a/sound/vore/sunesound/prey/taurswallow.ogg b/sound/vore/sunesound/prey/taurswallow.ogg index 925ac9229c..f5b5706b36 100644 Binary files a/sound/vore/sunesound/prey/taurswallow.ogg and b/sound/vore/sunesound/prey/taurswallow.ogg differ