cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into stupid-triggers

Browse Source
This commit is contained in:
Fox-McCloud
2015-10-06 18:25:26 -04:00
parent 9c3e6f1ecd 100edde399
commit 6d978232d5
94 changed files with 1308 additions and 1377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system.dm
-7
View File
@@ -63,13 +63,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
return
return
/obj/effect/effect/water/Destroy()
//var/turf/T = src.loc
//if (istype(T, /turf))
// T.firelevel = 0 //TODO: FIX
src.delete()
return ..()
/obj/effect/effect/water/Move(turf/newloc)
//var/turf/T = src.loc
//if (istype(T, /turf))