From 141519b8262c5bc147d5c79b011443ea565a7a22 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Wed, 18 Jan 2023 03:27:00 +0100 Subject: [PATCH 1/3] Add a mode to muffle items. --- code/__defines/belly_modes_vr.dm | 1 + code/game/objects/items.dm | 7 ++++--- code/game/objects/items/weapons/storage/backpack.dm | 12 ++++++++++-- code/game/objects/items/weapons/storage/storage.dm | 7 ++++++- code/game/objects/items_vr.dm | 13 ++++++++++++- code/modules/vore/eating/belly_obj_vr.dm | 2 +- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/code/__defines/belly_modes_vr.dm b/code/__defines/belly_modes_vr.dm index 7ac58ddf6b..4260c8fd34 100644 --- a/code/__defines/belly_modes_vr.dm +++ b/code/__defines/belly_modes_vr.dm @@ -22,6 +22,7 @@ #define DM_FLAG_JAMSENSORS 0x20 #define DM_FLAG_FORCEPSAY 0x40 #define DM_FLAG_SLOWBODY 0x80 //CHOMPAdd +#define DM_FLAG_MUFFLEITEMS 0x100 //CHOMPAdd //Item related modes #define IM_HOLD "Hold" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 645168b041..c2f39295ef 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -361,12 +361,13 @@ if(user.client) user.client.screen |= src if(user.pulling == src) user.stop_pulling() if((slot_flags & slot)) - if(equip_sound) + if(equip_sound && !muffled_by_belly(user)) playsound(src, equip_sound, 20) - else + else if(!muffled_by_belly(user)) playsound(src, drop_sound, 20) else if(slot == slot_l_hand || slot == slot_r_hand) - playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds) + if(!muffled_by_belly(user)) + playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds) return // As above but for items being equipped to an active module on a robot. diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 50b6e9ba8c..9f4cbb4305 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -22,7 +22,15 @@ /obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot) if (slot == slot_back && src.use_sound) - playsound(src, src.use_sound, 50, 1, -5) +// Chomp edit + if(isbelly(user.loc)) + var/obj/belly/B = user.loc + if(B.mode_flags & DM_FLAG_MUFFLEITEMS) + return + else +// Chomp edit end + playsound(src, src.use_sound, 50, 1, -5) + ..(user, slot) /* @@ -495,4 +503,4 @@ desc = "A satchel designed for the Go Go ERT Rangers series to allow for slightly bigger carry capacity for the ERT-Rangers.\ Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content." icon = 'icons/obj/clothing/ranger.dmi' - icon_state = "ranger_satchel" \ No newline at end of file + icon_state = "ranger_satchel" diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 12b2b5b2fb..acb61f7192 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -237,7 +237,12 @@ /obj/item/weapon/storage/proc/open(mob/user as mob) if (use_sound) - playsound(src, src.use_sound, 50, 0, -5) + // Chomp edit + if(isbelly(user.loc)) + var/obj/belly/B = user.loc + if(!B.mode_flags & DM_FLAG_MUFFLEITEMS) + playsound(src, src.use_sound, 50, 0, -5) + // Chomp edit end orient2hud(user) if(user.s_active) diff --git a/code/game/objects/items_vr.dm b/code/game/objects/items_vr.dm index 4b8dbcaae5..09b7ff7ffd 100644 --- a/code/game/objects/items_vr.dm +++ b/code/game/objects/items_vr.dm @@ -24,4 +24,15 @@ possessed_voice.Add(new_voice) listening_objects |= src new_voice.verbs -= /mob/living/voice/verb/change_name //No changing your name! Bad! - new_voice.verbs -= /mob/living/voice/verb/hang_up //Also you can't hang up. You are the item! \ No newline at end of file + new_voice.verbs -= /mob/living/voice/verb/hang_up //Also you can't hang up. You are the item! + +// Chomp edit +/obj/item/proc/muffled_by_belly(var/mob/user) + if(isbelly(user.loc)) + var/obj/belly/B = user.loc + if(B.mode_flags & DM_FLAG_MUFFLEITEMS) + return TRUE + return FALSE + else + return FALSE +// Chomp edit end diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index a0f977d789..a252c2c1a7 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -72,7 +72,7 @@ //Actual full digest modes var/tmp/static/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_ABSORB,DM_DRAIN,DM_SELECT,DM_UNABSORB,DM_HEAL,DM_SHRINK,DM_GROW,DM_SIZE_STEAL,DM_EGG) //Digest mode addon flags - var/tmp/static/list/mode_flag_list = list("Numbing" = DM_FLAG_NUMBING, "Stripping" = DM_FLAG_STRIPPING, "Leave Remains" = DM_FLAG_LEAVEREMAINS, "Muffles" = DM_FLAG_THICKBELLY, "Affect Worn Items" = DM_FLAG_AFFECTWORN, "Jams Sensors" = DM_FLAG_JAMSENSORS, "Complete Absorb" = DM_FLAG_FORCEPSAY, "Slow Body Digestion" = DM_FLAG_SLOWBODY) //CHOMPEdit + var/tmp/static/list/mode_flag_list = list("Numbing" = DM_FLAG_NUMBING, "Stripping" = DM_FLAG_STRIPPING, "Leave Remains" = DM_FLAG_LEAVEREMAINS, "Muffles" = DM_FLAG_THICKBELLY, "Affect Worn Items" = DM_FLAG_AFFECTWORN, "Jams Sensors" = DM_FLAG_JAMSENSORS, "Complete Absorb" = DM_FLAG_FORCEPSAY, "Slow Body Digestion" = DM_FLAG_SLOWBODY, "Muffle Items" = DM_FLAG_MUFFLEITEMS) //CHOMPEdit //Item related modes var/tmp/static/list/item_digest_modes = list(IM_HOLD,IM_DIGEST_FOOD,IM_DIGEST,IM_DIGEST_PARALLEL) From ff68eaaffdc2445cbc0daa7d7d895c615a315420 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Wed, 18 Jan 2023 03:52:33 +0100 Subject: [PATCH 2/3] Fix it in a bad way. --- code/game/objects/items/weapons/storage/storage.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index acb61f7192..b7c462e73d 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -240,7 +240,9 @@ // Chomp edit if(isbelly(user.loc)) var/obj/belly/B = user.loc - if(!B.mode_flags & DM_FLAG_MUFFLEITEMS) + if(B.mode_flags & DM_FLAG_MUFFLEITEMS) + // Do nothing + else playsound(src, src.use_sound, 50, 0, -5) // Chomp edit end From fc5996977cf7cff00e6040604d210142c7f362b4 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Sun, 29 Jan 2023 19:39:13 +0100 Subject: [PATCH 3/3] Add comments --- code/game/objects/items.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c2f39295ef..1bf8d5e57d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -360,6 +360,7 @@ user.position_hud_item(src,slot) if(user.client) user.client.screen |= src if(user.pulling == src) user.stop_pulling() + // Chomp edit starts if((slot_flags & slot)) if(equip_sound && !muffled_by_belly(user)) playsound(src, equip_sound, 20) @@ -368,6 +369,7 @@ else if(slot == slot_l_hand || slot == slot_r_hand) if(!muffled_by_belly(user)) playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds) + // Chomp edit stops return // As above but for items being equipped to an active module on a robot.