diff --git a/code/_helpers/global_lists_ch.dm b/code/_helpers/global_lists_ch.dm index 3af2ebac51..c43cebb5af 100644 --- a/code/_helpers/global_lists_ch.dm +++ b/code/_helpers/global_lists_ch.dm @@ -36,6 +36,7 @@ var/global/list/item_digestion_blacklist = list( /obj/item/device/perfect_tele_beacon, /obj/item/organ/internal/brain/slime, /obj/item/device/mmi/digital/posibrain, + /obj/item/device/mmi/digital/robot, /obj/item/weapon/rig/protean) // Options for transforming into a different mob in virtual reality. @@ -190,4 +191,4 @@ var/global/list/vr_mob_spawner_options = list( "Farwa" = /mob/living/carbon/human/farwa, "Neaera" = /mob/living/carbon/human/neaera, "Stok" = /mob/living/carbon/human/stok - ) \ No newline at end of file + ) diff --git a/code/modules/reagents/holder/holder.dm b/code/modules/reagents/holder/holder.dm index 177c62af9f..8a22d5db79 100644 --- a/code/modules/reagents/holder/holder.dm +++ b/code/modules/reagents/holder/holder.dm @@ -268,8 +268,8 @@ //If for some reason touch effects are bypassed (e.g. injecting stuff directly into a reagent container or person), //call the appropriate trans_to_*() proc. /datum/reagents/proc/trans_to(var/atom/target, var/amount = 1, var/multiplier = 1, var/copy = 0) - //CHOMPEdit Start, we only can do the splashing first on carbon (Runtime reasons) - if(iscarbon(target)) + //CHOMPEdit Start, do not splash brains! + if(ismob(target) && !isbrain(target)) return splash_mob(target, amount * multiplier, copy) //CHOMPEdit End touch(target, amount * multiplier) //First, handle mere touch effects diff --git a/code/modules/vore/eating/belly_obj_ch.dm b/code/modules/vore/eating/belly_obj_ch.dm index c87497f0e4..64a9da370d 100644 --- a/code/modules/vore/eating/belly_obj_ch.dm +++ b/code/modules/vore/eating/belly_obj_ch.dm @@ -218,6 +218,8 @@ if(is_beneficial && reagents.total_volume) reagents.trans_to(L, affecting_amt, 1, FALSE) for(var/obj/item/I in touchable_atoms) + if(is_type_in_list(I, item_digestion_blacklist)) + continue if(reagents.total_volume) reagents.trans_to(I, affecting_amt, 1, FALSE) SEND_SIGNAL(src, COMSIG_BELLY_UPDATE_VORE_FX, FALSE, reagents.total_volume) // Signals vore_fx() reagents updates.