diff --git a/code/game/objects/effects/chemsmoke.dm b/code/game/objects/effects/chemsmoke.dm index 37ea4fd096c..f641561ba86 100644 --- a/code/game/objects/effects/chemsmoke.dm +++ b/code/game/objects/effects/chemsmoke.dm @@ -149,7 +149,7 @@ if(!dist) dist = 1 R.reaction_mob(A, volume = R.volume / dist) - else if(istype(A, /obj)) + else if(istype(A, /obj) && !A.simulated) R.reaction_obj(A, R.volume) sleep(30) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index a9562ca8610..71b73800b30 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -435,6 +435,8 @@ var/const/INGEST = 2 return 0 /datum/reagents/proc/reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=0) + if(!istype(A) || !A.simulated) + return switch(method) if(TOUCH)