From a485ec530eb4e7b0431bc8c97a43cc38e37d16bb Mon Sep 17 00:00:00 2001
From: stephen001 <stephen001@896068b8-3a4a-0410-b2c2-a9973c1052ca>
Date: Thu, 19 Jun 2008 00:05:54 +0000
Subject: [PATCH] Split water effects off into a separate file.

---
 Code/!atoms.dm        |  8 --------
 Code/Effects/water.dm | 31 +++++++++++++++++++++++++++++++
 Code/items.dm         | 23 -----------------------
 spacestation13.dme    |  3 ++-
 4 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 Code/Effects/water.dm

diff --git a/Code/!atoms.dm b/Code/!atoms.dm
index 99933e9..ab4b8cd 100644
--- a/Code/!atoms.dm
+++ b/Code/!atoms.dm
@@ -663,14 +663,6 @@
 	name = "ion trails"
 	icon_state = "ion_trails"
 	anchored = 1.0
-/obj/effects/water
-	name = "water"
-	icon = 'water.dmi'
-	icon_state = "extinguish"
-	var/life = 15.0
-	flags = 2.0
-	mouse_opacity = 0
-	weight = 1000
 /obj/equip_e
 	name = "equip e"
 	var/mob/source = null
diff --git a/Code/Effects/water.dm b/Code/Effects/water.dm
new file mode 100644
index 0000000..102cb87
--- /dev/null
+++ b/Code/Effects/water.dm
@@ -0,0 +1,31 @@
+/obj/effects/water
+	flags 			= 2.0
+	icon 			= 'water.dmi'
+	icon_state 		= "extinguish"
+	mouse_opacity 	= 0
+	name 			= "water"
+	weight 			= 1000
+	var/life 		= 15.0
+
+	New()
+		..()
+		var/turf/T = src.loc
+		if (istype(T, /turf))
+			T.firelevel = 0
+		spawn(70) del(src)
+
+	Del()
+		var/turf/T = src.loc
+		if (istype(T, /turf))
+			T.firelevel = 0
+		..()
+
+	Move(turf/newloc)
+		var/turf/T = src.loc
+		if (istype(T, /turf))
+			T.firelevel = 0
+		if (--src.life < 1)
+			del(src)
+		if(newloc.density)
+			return 0
+		.=..()
diff --git a/Code/items.dm b/Code/items.dm
index 1ff11b2..8fcfa50 100644
--- a/Code/items.dm
+++ b/Code/items.dm
@@ -5561,29 +5561,6 @@
 		else
 			M.loc = locate(tx, ty, src.target.z)
 
-/obj/effects/water/New()
-	..()
-	var/turf/T = src.loc
-	if (istype(T, /turf))
-		T.firelevel = 0
-	spawn(70) del(src)
-
-/obj/effects/water/Del()
-	var/turf/T = src.loc
-	if (istype(T, /turf))
-		T.firelevel = 0
-	..()
-
-/obj/effects/water/Move(turf/newloc)
-	var/turf/T = src.loc
-	if (istype(T, /turf))
-		T.firelevel = 0
-	if (--src.life < 1)
-		del(src)
-	if(newloc.density)
-		return 0
-	.=..()
-
 /mob/attackby(obj/item/weapon/W, mob/user)
 	var/shielded = 0
 	for(var/obj/item/weapon/shield/S in src)
diff --git a/spacestation13.dme b/spacestation13.dme
index c07753f..60b42c0 100644
--- a/spacestation13.dme
+++ b/spacestation13.dme
@@ -132,6 +132,7 @@
 #include "Code\Machinery\Power\terminal.dm"
 #include "Code\Machinery\Power\turbine.dm"
 #include "Code\mob\ai.dm"
-#include "Code\mob\drone.dm"
+#include "Code\mob\drone.dm"
+#include "Code\Effects\water.dm"
 // END_INCLUDE