mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
blacklist for belly liquids (#7777)
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user