From 8a94211bb412896ac70e597dcd98c27d89a8063d Mon Sep 17 00:00:00 2001 From: Kelenius Date: Thu, 28 May 2015 18:29:07 +0300 Subject: [PATCH 1/2] Chem puffs will now touch objects on tile before splashing on the mob --- code/game/objects/effects/chem/water.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/chem/water.dm b/code/game/objects/effects/chem/water.dm index 4ae012cc9e..cd92127fe8 100644 --- a/code/game/objects/effects/chem/water.dm +++ b/code/game/objects/effects/chem/water.dm @@ -20,12 +20,15 @@ step_towards(src, target) var/turf/T = get_turf(src) reagents.touch_turf(T) - var/mob/M = locate() in T + var/mob/M + for(var/atom/A in T) + if(!ismob(A)) // Mobs are handled differently + reagents.touch(A) + else if(!M) + M = A if(M) reagents.splash_mob(M, reagents.total_volume) break - for(var/atom/A in T) - reagents.touch(A) if(T == get_turf(target)) break sleep(delay) From 345cd7a73828f220baa98a93cffbc1f4497669af Mon Sep 17 00:00:00 2001 From: Kelenius Date: Fri, 5 Jun 2015 19:20:46 +0300 Subject: [PATCH 2/2] Adds a simulated check to chempuffs --- code/game/objects/effects/chem/water.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/chem/water.dm b/code/game/objects/effects/chem/water.dm index 6566668c55..eac107923e 100644 --- a/code/game/objects/effects/chem/water.dm +++ b/code/game/objects/effects/chem/water.dm @@ -25,9 +25,9 @@ reagents.touch_turf(T) var/mob/M for(var/atom/A in T) - if(!ismob(A)) // Mobs are handled differently + if(!ismob(A) && A.simulated) // Mobs are handled differently reagents.touch(A) - else if(!M) + else if(ismob(A) && !M) M = A if(M) reagents.splash_mob(M, reagents.total_volume)