From 98ce2cb4ef784cdaff654785a75374eb16cd6b7d Mon Sep 17 00:00:00 2001 From: Poojawa Date: Tue, 2 Apr 2019 02:57:59 -0500 Subject: [PATCH] Makes belly noises actually togglable --- .../code/modules/vore/eating/living_vr.dm | 2 ++ .../code/modules/vore/eating/vore_vr.dm | 5 +++++ .../code/modules/vore/eating/vorepanel_vr.dm | 16 +++++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/modules/vore/eating/living_vr.dm b/modular_citadel/code/modules/vore/eating/living_vr.dm index 469dcee276..7848f1f913 100644 --- a/modular_citadel/code/modules/vore/eating/living_vr.dm +++ b/modular_citadel/code/modules/vore/eating/living_vr.dm @@ -388,6 +388,7 @@ 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() @@ -412,6 +413,7 @@ 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/vore_vr.dm b/modular_citadel/code/modules/vore/eating/vore_vr.dm index 4cf223c3c4..64435619ae 100644 --- a/modular_citadel/code/modules/vore/eating/vore_vr.dm +++ b/modular_citadel/code/modules/vore/eating/vore_vr.dm @@ -41,6 +41,7 @@ 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 @@ -107,6 +108,7 @@ 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"] @@ -117,6 +119,8 @@ 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() @@ -132,6 +136,7 @@ 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 c83ee788cb..4238ae4a7b 100644 --- a/modular_citadel/code/modules/vore/eating/vorepanel_vr.dm +++ b/modular_citadel/code/modules/vore/eating/vorepanel_vr.dm @@ -695,7 +695,7 @@ var/choice = alert(user, "This button is for those who don't like being digested. It can make you undigestable to all mobs. Digesting you is currently: [user.digestable ? "Allowed" : "Prevented"]", "", "Allow Digestion", "Cancel", "Prevent Digestion") switch(choice) if("Cancel") - return + return 0 if("Allow Digestion") user.digestable = TRUE if("Prevent Digestion") @@ -708,7 +708,7 @@ var/choice = alert(user, "This button is for those who don't like vore at all. Devouring you is currently: [user.devourable ? "Allowed" : "Prevented"]", "", "Allow Devourment", "Cancel", "Prevent Devourment") switch(choice) if("Cancel") - return + return 0 if("Allow Devourment") user.devourable = TRUE if("Prevent Devourment") @@ -721,7 +721,7 @@ var/choice = alert(user, "This button is to toggle your ability to be fed to others. Feeding predators is currently: [user.feeding ? "Allowed" : "Prevented"]", "", "Allow Feeding", "Cancel", "Prevent Feeding") switch(choice) if("Cancel") - return + return 0 if("Allow Feeding") user.feeding = TRUE if("Prevent Feeding") @@ -730,5 +730,15 @@ 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