From e26844df126711f0f2912e4df7938284e474d188 Mon Sep 17 00:00:00 2001
From: Loganbacca <wookieemanlogan@hotmail.com>
Date: Fri, 7 Feb 2014 18:07:02 +1300
Subject: [PATCH] New areas for engineering remap

- Also moved hallway from Caels Rust areas.dm file to main Space Station 13 areas.dm file
---
 .../WorkInProgress/Cael_Aislinn/Rust/areas.dm |  4 ---
 code/game/area/Space Station 13 areas.dm      | 26 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm
index 8887859fc0..b5f935f9e2 100644
--- a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm
@@ -68,7 +68,3 @@
 	storage_hard
 		name = "\improper Engineering Hard Storage"
 		icon_state = "engine_storage"
-
-	hallway
-		name = "\improper Engineering storage"
-		icon_state = "engine_hallway"
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 8b400a208e..dde7f73c80 100755
--- a/code/game/area/Space Station 13 areas.dm	
+++ b/code/game/area/Space Station 13 areas.dm	
@@ -664,6 +664,10 @@ var/list/ghostteleportlocs = list()
 	name = "Waste Disposal"
 	icon_state = "disposal"
 
+/area/maintenance/evahallway
+	name = "\improper EVA Hallway"
+	icon_state = "eva"
+
 //Hallway
 
 /area/hallway/primary/fore
@@ -938,18 +942,38 @@ var/list/ghostteleportlocs = list()
 		name = "\improper Engine Monitoring Room"
 		icon_state = "engine_monitoring"
 
+	engineering_monitoring
+		name = "\improper Engineering Monitoring Room"
+		icon_state = "engine_monitoring"
+
 	engineering
 		name = "Engineering"
 		icon_state = "engine_smes"
 
+	engineering_foyer
+		name = "\improper Engineering Foyer"
+		icon_state = "engine"
+
 	break_room
-		name = "Engineering Foyer"
+		name = "\improper Engineering Break Room"
 		icon_state = "engine"
 
 	chiefs_office
 		name = "\improper Chief Engineer's office"
 		icon_state = "engine_control"
 
+	hallway
+		name = "\improper Engineering Hallway"
+		icon_state = "engine_hallway"
+
+	workshop
+		name = "\improper Engineering Workshop"
+		icon_state = "engine_storage"
+
+	locker_room
+		name = "\improper Engineering Locker Room"
+		icon_state = "engine_storage"
+
 
 //Solars