diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 1e83517977..ca4f230905 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1142,16 +1142,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) H.add_trait(TRAIT_FAT, OBESITY) H.update_inv_w_uniform() H.update_inv_wear_suit() - - /* - if(H.noisy && H.nutrition <= NUTRITION_LEVEL_STARVING) - if(prob(10)) - playsound(get_turf(H),"hunger_sounds",35,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED) - - else if(H.noisy && H.nutrition <= NUTRITION_LEVEL_HUNGRY) - if(prob(10)) - playsound(get_turf(H),"hunger_sounds",15,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED) - */ // nutrition decrease and satiety if (H.nutrition > 0 && H.stat != DEAD && !H.has_trait(TRAIT_NOHUNGER)) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 941ba0ec69..ec858fdff5 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -345,7 +345,15 @@ /mob/living/simple_animal/hostile/proc/AttackingTarget() in_melee = TRUE - return target.attack_animal(src) + if(isliving(target)) + var/mob/living/L = target + if(L.Adjacent(src) && vore_active && L.devourable) // aggressive check to ensure vore attacks can be made + if(prob(voracious_chance)) + vore_attack(src,L,src) + else + return L.attack_animal(src) + else + return target.attack_animal(src) /mob/living/simple_animal/hostile/proc/Aggro() vision_range = aggro_vision_range diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm index 71c393b592..26f146b952 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm @@ -47,6 +47,6 @@ vore_sound = "Tauric Swallow" desc = "With a rush of burning ichor greeting you, you're introduced to the Drake's stomach. Wrinkled walls greedily grind against you, acidic slimes working into your body as you become fuel and nutriton for a superior predator. All that's left is your body's willingness to resist your destiny." digest_mode = DM_DRAGON - digest_burn = 5 + digest_burn = 2 swallow_time = 100 // costs extra time to eat directly to here escapechance = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 92ac07b1a0..a07e46a289 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -85,7 +85,7 @@ OpenFire() if(L.Adjacent(src) && (L.stat != CONSCIOUS)) if(vore_active && L.devourable == TRUE) - dragon_feeding(src,L) + vore_attack(src,L,src) LoseTarget() else devour(L) diff --git a/code/modules/mob/living/simple_animal/simple_animal_vr.dm b/code/modules/mob/living/simple_animal/simple_animal_vr.dm index 41c7971533..afb1b88d3b 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm @@ -1,21 +1,29 @@ +#define VORACIOUS_CHANCE 40 +#define VORE_SWALLOW_TIME 50 + /mob/living/simple_animal - // List of targets excluded (for now) from being eaten by this mob. - var/list/prey_exclusions = list() - devourable = FALSE //insurance because who knows. - digestable = TRUE //I mean, if it's devourable it should also be digestible - var/vore_active = FALSE // If vore behavior is enabled for this mob + //Specific vore behaviors + var/vore_active = FALSE // If vore behavior is enabled for this mob + var/isPredator = FALSE //Are they capable of performing and pre-defined vore actions for their species? + var/swallowTime = VORE_SWALLOW_TIME //How long it takes to eat Human and other Simple_animal prey in 1/10 of a second. The default is 5 seconds. + var/list/prey_excludes = list() //For excluding people from being eaten. + var/voracious_chance = VORACIOUS_CHANCE //Mob AI Engagement probability when rolling between regular melee strike and a vore attempt, default 40% - var/vore_default_mode = DM_DIGEST // Default bellymode (DM_DIGEST, DM_HOLD, DM_ABSORB) - var/vore_digest_chance = 25 // Chance to switch to digest mode if resisted - var/vore_escape_chance = 25 // Chance of resisting out of mob - var/vore_absorb_chance = 0 // chance of absorbtion by mob + // Vore belly interactions + // Most mobs are only going to have the one gut. Multi-gut set ups should refer to Ash Drake's dragon_vore.dm for set up. - var/vore_stomach_name // The name for the first belly if not "stomach" - var/vore_stomach_flavor // The flavortext for the first belly if not the default - - var/vore_fullness = 0 // How "full" the belly is (controls icons) - var/list/living_mobs = list() + var/vore_default_sound = "Gulp" // Default vore sound + var/vore_default_release = "Splatter" // Default release sound + var/vore_wetness = TRUE // Default for a wet belly + var/vore_default_mode = DM_DIGEST // Default bellymode (DM_DIGEST, DM_HOLD, DM_ABSORB) + var/vore_digest_chance = VORACIOUS_CHANCE // Chance to switch to digest mode if resisted, default 40% + var/vore_escape_chance = VORACIOUS_CHANCE // Chance of resisting out of mob, default 40% + var/vore_absorb_chance = 0 // chance of absorbtion by mob, default 0% + var/vore_stomach_name // The name for the first belly if not "stomach" + var/vore_stomach_flavor // The flavortext for the first belly if not the default + //Icon Memes + var/vore_fullness = 0 // How "full" the belly is (controls icons) // Release belly contents before being gc'd! /mob/living/simple_animal/Destroy() @@ -34,35 +42,19 @@ vore_fullness = new_fullness -/* -/mob/living/simple_animal/proc/swallow_check() - for(var/I in vore_organs) - var/obj/belly/B = vore_organs[I] - if(vore_active) - update_fullness() - if(!vore_fullness) - // Nothing - return - else - addtimer(CALLBACK(src, .proc/swallow_mob), B.swallow_time) - -/mob/living/simple_animal/proc/swallow_mob() - for(var/I in vore_organs) - var/obj/belly/B = vore_organs[I] - for(var/mob/living/M in B.contents) - B.transfer_contents(M, transferlocation) -*/ - /mob/living/simple_animal/death() release_vore_contents(silent = TRUE) . = ..() // Simple animals have only one belly. This creates it (if it isn't already set up) -/mob/living/simple_animal/proc/init_belly() +/mob/living/simple_animal/init_vore() + vore_init = TRUE if(vore_organs.len) return if(no_vore) //If it can't vore, let's not give it a stomach. return + if(vore_active && !IsAdvancedToolUser()) //vore active, but doesn't have thumbs to grab people with. + verbs |= /mob/living/simple_animal/proc/animal_nom var/obj/belly/B = new /obj/belly(src) vore_selected = B @@ -70,6 +62,9 @@ B.name = vore_stomach_name ? vore_stomach_name : "stomach" B.desc = vore_stomach_flavor ? vore_stomach_flavor : "Your surroundings are warm, soft, and slimy. Makes sense, considering you're inside \the [name]." B.digest_mode = vore_default_mode + B.vore_sound = vore_default_sound + B.release_sound = vore_default_release + B.is_wet = vore_wetness B.escapable = vore_escape_chance > 0 B.escapechance = vore_escape_chance B.digestchance = vore_digest_chance @@ -97,21 +92,42 @@ "The juices pooling beneath you sizzle against your sore skin.", "The churning walls slowly pulverize you into meaty nutrients.", "The stomach glorps and gurgles as it tries to work you into slop.") -/* B.emote_lists[DM_ITEMWEAK] = list( - "The burning acids eat away at your form.", - "The muscular stomach flesh grinds harshly against you.", - "The caustic air stings your chest when you try to breathe.", - "The slimy guts squeeze inward to help the digestive juices soften you up.", - "The onslaught against your body doesn't seem to be letting up; you're food now.", - "The predator's body ripples and crushes against you as digestive enzymes pull you apart.", - "The juices pooling beneath you sizzle against your sore skin.", - "The churning walls slowly pulverize you into meaty nutrients.", - "The stomach glorps and gurgles as it tries to work you into slop.")*/ -//Grab = Nomf -/* -/mob/living/simple_animal/UnarmedAttack(var/atom/A, var/proximity) - . = ..() +// +// Simple proc for animals to have their digestion toggled on/off externally +// +/mob/living/simple_animal/verb/toggle_digestion() + set name = "Toggle Animal's Digestion" + set desc = "Enables digestion on this mob for 20 minutes." + set category = "Object" + set src in oview(1) - if(a_intent == I_GRAB && isliving(A) && !has_hands) - animal_nom(A)*/ \ No newline at end of file + var/datum/belly/B = vore_organs[vore_selected] + if(faction != usr.faction) + to_chat(usr,"This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you.") + return + if(B.digest_mode == "Hold") + var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel") + if(confirm == "Enable") + B.digest_mode = "Digest" + sleep(20 MINUTES) //12000=20 minutes + B.digest_mode = "Hold" + else + var/confirm = alert(usr, "This mob is currently set to digest all stomach contents. Do you want to disable this?", "Disabling [name]'s Digestion", "Disable", "Cancel") + if(confirm == "Disable") + B.digest_mode = "Hold" + +// +// Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs. +// +/mob/living/simple_animal/proc/animal_nom(var/mob/living/T in oview(1)) + set name = "Animal Nom" + set category = "Vore" + set desc = "Since you can't grab, you get a verb!" + + if (stat != CONSCIOUS) + return + if (T.devourable == FALSE) + to_chat(usr, "You can't eat this!") + return + return vore_attack(usr,T,usr) diff --git a/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm b/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm index c958d690eb..0daf68f6c1 100644 --- a/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm +++ b/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm @@ -1,102 +1,141 @@ -/mob/living/simple_animal/pet/cat - devourable = TRUE - digestible = TRUE - no_vore = FALSE - -/mob/living/simple_animal/crab - devourable = TRUE - digestible = TRUE - -/mob/living/simple_animal/pet/dog - devourable = TRUE - digestible = TRUE - no_vore = FALSE - -/mob/living/simple_animal/hostile/retaliate/goat - devourable = TRUE - digestible = TRUE - no_vore = FALSE - -/mob/living/simple_animal/cow - devourable = TRUE - digestible = TRUE - no_vore = FALSE - -/mob/living/simple_animal/chick - devourable = TRUE - digestible = TRUE - -/mob/living/simple_animal/chicken - devourable = TRUE - digestible = TRUE - no_vore = FALSE - -/mob/living/simple_animal/pet/fox - no_vore = FALSE - -/mob/living/simple_animal/hostile/lizard - devourable = TRUE - digestible = TRUE - -/mob/living/simple_animal/mouse - devourable = TRUE - digestible = TRUE - -/mob/living/simple_animal/pet/penguin - no_vore = TRUE - -/mob/living/simple_animal/pet - devourable = TRUE - digestible = TRUE - -/mob/living/simple_animal/sloth - devourable = TRUE - digestible = TRUE - -/mob/living/simple_animal/hostile/alien - devourable = TRUE - digestible = TRUE - no_vore = FALSE - -/mob/living/simple_animal/hostile/bear - devourable = TRUE - digestible = TRUE - no_vore = FALSE - -/mob/living/simple_animal/hostile/poison/giant_spider - devourable = TRUE - digestible = TRUE - -/mob/living/simple_animal/hostile/retaliate/poison/snake - devourable = TRUE - digestible = TRUE - no_vore = FALSE //oh yes my pretty. - -/mob/living/simple_animal/hostile/gorilla - devourable = TRUE - digestible = TRUE - no_vore = FALSE - -/mob/living/simple_animal/hostile/megafauna/dragon - no_vore = FALSE - -/mob/living/simple_animal/hostile/asteroid/goliath - no_vore = FALSE - -/mob/living/simple_animal/parrot - devourable = TRUE - no_vore = FALSE - -/mob/living/simple_animal - no_vore = TRUE - +//CARBON MOBS /mob/living/carbon/alien devourable = TRUE + digestable = TRUE + feeding = TRUE /mob/living/carbon/monkey devourable = TRUE - digestible = TRUE + digestable = TRUE + feeding = TRUE + + +/* + REFER TO code/modules/mob/living/simple_animal/simple_animal_vr.dm for Var information! +*/ + + +//NUETRAL MOBS +/mob/living/simple_animal/crab + devourable = TRUE + digestable = TRUE + feeding = TRUE + +/mob/living/simple_animal/cow + devourable = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/chick + devourable = TRUE + digestable = TRUE + +/mob/living/simple_animal/chicken + devourable = TRUE + digestable = TRUE + +/mob/living/simple_animal/mouse + devourable = TRUE + digestable = TRUE + +//STATION PETS +/mob/living/simple_animal/pet + devourable = TRUE + digestable = TRUE + feeding = TRUE + +/mob/living/simple_animal/pet/fox + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/pet/cat + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/pet/dog + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/sloth + devourable = TRUE + digestable = TRUE + feeding = TRUE + +/mob/living/simple_animal/parrot + devourable = TRUE + digestable = TRUE + +//HOSTILE MOBS +/mob/living/simple_animal/hostile/retaliate/goat + devourable = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + isPredator = TRUE + vore_stomach_flavor = "You find yourself squeezed into the hollow of the goat, the smell of oats and hay thick in the tight space, all of which grinds in on you. Harmless for now..." + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/hostile/lizard + devourable = TRUE + digestable = TRUE + +/mob/living/simple_animal/hostile/alien + devourable = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/hostile/bear + devourable = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/hostile/poison/giant_spider + devourable = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/hostile/retaliate/poison/snake + devourable = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/hostile/gorilla + devourable = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD + +/mob/living/simple_animal/hostile/asteroid/goliath + devourable = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD /mob/living/simple_animal/hostile/carp devourable = TRUE - digestible = TRUE + digestable = TRUE + feeding = TRUE + vore_active = TRUE + isPredator = TRUE + vore_default_mode = DM_HOLD diff --git a/modular_citadel/code/modules/vore/eating/living_vr.dm b/modular_citadel/code/modules/vore/eating/living_vr.dm index cb194ddc65..b1d2a46ff2 100644 --- a/modular_citadel/code/modules/vore/eating/living_vr.dm +++ b/modular_citadel/code/modules/vore/eating/living_vr.dm @@ -9,7 +9,6 @@ var/vore_taste = null // What the character tastes like var/no_vore = FALSE // If the character/mob can vore. var/openpanel = 0 // Is the vore panel open? - var/noisy = FALSE // tummies are rumbly? var/absorbed = FALSE //are we absorbed? var/next_preyloop var/vore_init = FALSE //Has this mob's vore been initialized yet? @@ -140,51 +139,6 @@ var/belly = input("Choose Belly") in pred.vore_organs return perform_the_nom(user, prey, pred, belly) -//Dragon noms need to be faster -/mob/living/proc/dragon_feeding(var/mob/living/user, var/mob/living/prey) - var/belly = user.vore_selected - return perform_dragon(user, prey, user, belly) - -/mob/living/proc/perform_dragon(var/mob/living/user, var/mob/living/prey, var/mob/living/pred, var/obj/belly/belly, swallow_time = 20) - //Sanity - if(!user || !prey || !pred || !istype(belly) || !(belly in pred.vore_organs)) - testing("[user] attempted to feed [prey] to [pred], via [lowertext(belly.name)] but it went wrong.") - return FALSE - - if(istype(pred, /mob/living/simple_animal/hostile/megafauna/dragon)) - if(isliving(prey) && !prey.Adjacent(pred)) - return FALSE - - // The belly selected at the time of noms - var/attempt_msg = "ERROR: Vore message couldn't be created. Notify a dev. (at)" - var/success_msg = "ERROR: Vore message couldn't be created. Notify a dev. (sc)" - - // Prepare messages - if(user == pred) //Feeding someone to yourself - attempt_msg = text("[] starts to [] [] into their []!",pred,lowertext(belly.vore_verb),prey,lowertext(belly.name)) - success_msg = text("[] manages to [] [] into their []!",pred,lowertext(belly.vore_verb),prey,lowertext(belly.name)) - - if(!prey.Adjacent(user)) // let's doublecheck for sanity's sake. - return FALSE - - // Announce that we start the attempt! - user.visible_message(attempt_msg) - - if(!do_mob(src, user, swallow_time)) - return FALSE // Prey escaped (or user disabled) before timer expired. - - // If we got this far, nom successful! Announce it! - user.visible_message(success_msg) - playsound(get_turf(user), "[belly.vore_sound]",75,0,-6,0) - - // Actually shove prey into the belly. - belly.nom_mob(prey, user) - if (pred == user) - message_admins("[key_name(pred)] ate [key_name(prey)].") - pred.log_message("[key_name(pred)] ate [key_name(prey)].", LOG_ATTACK) - prey.log_message("[key_name(prey)] was eaten by [key_name(pred)].", LOG_ATTACK) - return TRUE - // // Master vore proc that actually does vore procedures // @@ -391,7 +345,6 @@ P.digestable = src.digestable P.devourable = src.devourable P.feeding = src.feeding - P.noisy = src.noisy P.vore_taste = src.vore_taste var/list/serialized = list() @@ -417,7 +370,6 @@ digestable = P.digestable devourable = P.devourable feeding = P.feeding - noisy = P.noisy vore_taste = P.vore_taste release_vore_contents(silent = TRUE) diff --git a/modular_citadel/code/modules/vore/eating/simple_animal_vr.dm b/modular_citadel/code/modules/vore/eating/simple_animal_vr.dm deleted file mode 100644 index a93eb2fcf4..0000000000 --- a/modular_citadel/code/modules/vore/eating/simple_animal_vr.dm +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////// Simple Animal ///////////////////// -/mob/living/simple_animal - var/isPredator = FALSE //Are they capable of performing and pre-defined vore actions for their species? - var/swallowTime = 5 SECONDS //How long it takes to eat its prey in 1/10 of a second. The default is 5 seconds. - var/list/prey_excludes = list() //For excluding people from being eaten. - -// -// Simple proc for animals to have their digestion toggled on/off externally -// -/mob/living/simple_animal/verb/toggle_digestion() - set name = "Toggle Animal's Digestion" - set desc = "Enables digestion on this mob for 20 minutes." - set category = "Object" - set src in oview(1) - - var/datum/belly/B = vore_organs[vore_selected] - if(faction != usr.faction) - to_chat(usr,"This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you.") - return - if(B.digest_mode == "Hold") - var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel") - if(confirm == "Enable") - B.digest_mode = "Digest" - sleep(20 MINUTES) //12000=20 minutes - B.digest_mode = "Hold" - else - var/confirm = alert(usr, "This mob is currently set to digest all stomach contents. Do you want to disable this?", "Disabling [name]'s Digestion", "Disable", "Cancel") - if(confirm == "Disable") - B.digest_mode = "Hold" - -// -// Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs. -// -/mob/living/simple_animal/proc/animal_nom(var/mob/living/T in oview(1)) - set name = "Animal Nom" - set category = "Vore" - set desc = "Since you can't grab, you get a verb!" - - if (stat != CONSCIOUS) - return - if (T.devourable == FALSE) - to_chat(usr, "You can't eat this!") - return - return feed_grabbed_to_self(src,T) \ No newline at end of file diff --git a/modular_citadel/code/modules/vore/eating/vore_vr.dm b/modular_citadel/code/modules/vore/eating/vore_vr.dm index 64435619ae..dc813d70aa 100644 --- a/modular_citadel/code/modules/vore/eating/vore_vr.dm +++ b/modular_citadel/code/modules/vore/eating/vore_vr.dm @@ -28,7 +28,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE // The datum type bolted onto normal preferences datums for storing Vore stuff // -#define VORE_VERSION 3 +#define VORE_VERSION 4 GLOBAL_LIST_EMPTY(vore_preferences_datums) @@ -41,7 +41,6 @@ GLOBAL_LIST_EMPTY(vore_preferences_datums) var/devourable = FALSE var/feeding = FALSE // var/allowmobvore = TRUE - var/noisy = FALSE var/list/belly_prefs = list() var/vore_taste = "nothing in particular" // var/can_be_drop_prey = FALSE @@ -108,7 +107,6 @@ GLOBAL_LIST_EMPTY(vore_preferences_datums) digestable = json_from_file["digestable"] devourable = json_from_file["devourable"] feeding = json_from_file["feeding"] - noisy = json_from_file["noisy"] vore_taste = json_from_file["vore_taste"] belly_prefs = json_from_file["belly_prefs"] @@ -119,8 +117,6 @@ GLOBAL_LIST_EMPTY(vore_preferences_datums) devourable = FALSE if(isnull(feeding)) feeding = FALSE - if(isnull(noisy)) - noisy = FALSE if(isnull(belly_prefs)) belly_prefs = list() @@ -136,7 +132,6 @@ GLOBAL_LIST_EMPTY(vore_preferences_datums) "digestable" = digestable, "devourable" = devourable, "feeding" = feeding, - "noisy" = noisy, "vore_taste" = vore_taste, "belly_prefs" = belly_prefs, ) diff --git a/modular_citadel/code/modules/vore/eating/vorepanel_vr.dm b/modular_citadel/code/modules/vore/eating/vorepanel_vr.dm index 4238ae4a7b..2ac2628d1f 100644 --- a/modular_citadel/code/modules/vore/eating/vorepanel_vr.dm +++ b/modular_citadel/code/modules/vore/eating/vorepanel_vr.dm @@ -229,7 +229,6 @@ dat += "
Delete Belly" dat += "Set Flavor" - dat += "Toggle Hunger Noises" dat += "
" @@ -730,15 +729,5 @@ if(user.client.prefs_vr) user.client.prefs_vr.feeding = user.feeding - if(href_list["togglenoisy"]) - 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 - 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 \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 1cdc8cb21a..5b4c4eabe5 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2986,7 +2986,6 @@ #include "modular_citadel\code\modules\vore\eating\bellymodes_vr.dm" #include "modular_citadel\code\modules\vore\eating\digest_act_vr.dm" #include "modular_citadel\code\modules\vore\eating\living_vr.dm" -#include "modular_citadel\code\modules\vore\eating\simple_animal_vr.dm" #include "modular_citadel\code\modules\vore\eating\vore_vr.dm" #include "modular_citadel\code\modules\vore\eating\voreitems.dm" #include "modular_citadel\code\modules\vore\eating\vorepanel_vr.dm"