cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' into ofPuffsAndCleaner

Browse Source 
Conflicts:
	code/game/objects/effects/chem/water.dm
This commit is contained in:
Kelenius
2015-06-05 14:36:15 +03:00
parent 8a94211bb4 b6a0ac043f
commit 2ba5fd6af2
177 changed files with 3205 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/chem/water.dm
+15 -12
View File
@@ -17,20 +17,23 @@
if(!target)
return
for(var/i = 1 to step_count)
if(!loc)
return
step_towards(src, target)
var/turf/T = get_turf(src)
reagents.touch_turf(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
if(T == get_turf(target))
break
if(T && reagents)
reagents.touch_turf(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
if(T == get_turf(target))
break
sleep(delay)
sleep(10)
qdel(src)