cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

blacklist for belly liquids (#7777)

Browse Source
This commit is contained in:
Kashargul
2024-02-18 13:21:44 +01:00
committed by GitHub
parent 2928b8af60
commit 5e9562784b
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/_helpers/global_lists_ch.dm
View File

@@ -36,6 +36,7 @@ var/global/list/item_digestion_blacklist = list(
/obj/item/device/perfect_tele_beacon, /obj/item/device/perfect_tele_beacon,
/obj/item/organ/internal/brain/slime, /obj/item/organ/internal/brain/slime,
/obj/item/device/mmi/digital/posibrain, /obj/item/device/mmi/digital/posibrain,
/obj/item/device/mmi/digital/robot,
/obj/item/weapon/rig/protean) /obj/item/weapon/rig/protean)
// Options for transforming into a different mob in virtual reality. // 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, "Farwa" = /mob/living/carbon/human/farwa,
"Neaera" = /mob/living/carbon/human/neaera, "Neaera" = /mob/living/carbon/human/neaera,
"Stok" = /mob/living/carbon/human/stok "Stok" = /mob/living/carbon/human/stok
) )

4
code/modules/reagents/holder/holder.dm
View File

@@ -268,8 +268,8 @@
//If for some reason touch effects are bypassed (e.g. injecting stuff directly into a reagent container or person), //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. //call the appropriate trans_to_*() proc.
/datum/reagents/proc/trans_to(var/atom/target, var/amount = 1, var/multiplier = 1, var/copy = 0) /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) //CHOMPEdit Start, do not splash brains!
if(iscarbon(target)) if(ismob(target) && !isbrain(target))
return splash_mob(target, amount * multiplier, copy) return splash_mob(target, amount * multiplier, copy)
//CHOMPEdit End //CHOMPEdit End
touch(target, amount * multiplier) //First, handle mere touch effects touch(target, amount * multiplier) //First, handle mere touch effects

2
code/modules/vore/eating/belly_obj_ch.dm
View File

@@ -218,6 +218,8 @@
if(is_beneficial && reagents.total_volume) if(is_beneficial && reagents.total_volume)
reagents.trans_to(L, affecting_amt, 1, FALSE) reagents.trans_to(L, affecting_amt, 1, FALSE)
for(var/obj/item/I in touchable_atoms) for(var/obj/item/I in touchable_atoms)
if(is_type_in_list(I, item_digestion_blacklist))
continue
if(reagents.total_volume) if(reagents.total_volume)
reagents.trans_to(I, affecting_amt, 1, FALSE) 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. SEND_SIGNAL(src, COMSIG_BELLY_UPDATE_VORE_FX, FALSE, reagents.total_volume) // Signals vore_fx() reagents updates.