From d6d9a09da929afde17435aec5ac91f63c4b50388 Mon Sep 17 00:00:00 2001
From: stephen001 <stephen001@896068b8-3a4a-0410-b2c2-a9973c1052ca>
Date: Sat, 21 Jun 2008 22:28:27 +0000
Subject: [PATCH] Looks like I made a dodgy commit with the re-structuring of
 effects.

---
 Code/!atoms.dm     | 22 +++-------------------
 spacestation13.dme | 10 ++++++----
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/Code/!atoms.dm b/Code/!atoms.dm
index 1047611..83fce9a 100644
--- a/Code/!atoms.dm
+++ b/Code/!atoms.dm
@@ -32,7 +32,7 @@
 #define ONBELT 128			// can be put in belt slot
 #define FPRINT 256			// takes a fingerprint
 #define WINDOW 512			// window or window/door (or injector)
-	
+
 // channel numbers for power
 
 #define EQUIP 1
@@ -355,7 +355,7 @@
 	var/droneTransitioning = 0
 	var/cameraFollow = null
 	var/now_pushing = null
-	
+
 	var/list/organs = list(  )
 	var/list/grabbed_by = list(  )
 	var/list/requests = list(  )
@@ -413,7 +413,7 @@
 	var/image/face2 = null
 	var/h_style_r = "hair_a"
 	weight = 2500000.0
-	
+
 	var/list/body_standing = list(  )
 	var/list/body_lying = list(  )
 
@@ -664,14 +664,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
@@ -2471,14 +2463,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	icon = 'screen1.dmi'
 	icon_state = "arrow"
 	layer = 16.0
-/obj/portal
-	name = "portal"
-	icon = 'stationobjs.dmi'
-	icon_state = "portal"
-	density = 1
-	var/obj/target = null
-	anchored = 1.0
-
 /obj/rack
 	name = "rack"
 	icon = 'Icons.dmi'
diff --git a/spacestation13.dme b/spacestation13.dme
index 40fbcb9..a8de0e4 100644
--- a/spacestation13.dme
+++ b/spacestation13.dme
@@ -7,6 +7,8 @@
 // BEGIN_FILE_DIR
 #define FILE_DIR .
 #define FILE_DIR "Code"
+#define FILE_DIR "Code/CTF"
+#define FILE_DIR "Code/Effects"
 #define FILE_DIR "Code/Item"
 #define FILE_DIR "Code/Item/Weapon"
 #define FILE_DIR "Code/Machinery"
@@ -61,6 +63,9 @@
 #include "Code\wallFloorSpaceChanges-normal.dm"
 #include "Code\weap_sat.dm"
 #include "Code\weapons.dm"
+#include "Code\CTF\barrier.dm"
+#include "Code\Effects\portal.dm"
+#include "Code\Effects\water.dm"
 #include "Code\Item\Weapon\aimodules.dm"
 #include "Code\Item\Weapon\multitool.dm"
 #include "Code\Machinery\_machinery.dm"
@@ -132,9 +137,6 @@
 #include "Code\Machinery\Power\terminal.dm"
 #include "Code\Machinery\Power\turbine.dm"
 #include "Code\mob\ai.dm"
-#include "Code\mob\drone.dm"
-#include "Code\CTF\barrier.dm"
-#include "Code\Effects\portal.dm"
-#include "Code\Effects\water.dm"
+#include "Code\mob\drone.dm"
 // END_INCLUDE