Merge pull request #9795 from Ghommie/Ghommie-cit346

Unmodularize areas.

code/game/area/Space_Station_13_areas.dm

@@ -250,7 +250,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/maintenance/disposal/incinerator
 	name = "Incinerator"
 	icon_state = "disposal"
+/area/maintenance/bar
+	name = "Maintenance Bar"
+	icon_state = "maintbar"
 
+/area/maintenance/bar/cafe
+	name = "Abandoned Cafe"
 
 //Hallway
 
@@ -499,6 +504,16 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Abandoned Theatre"
 	icon_state = "Theatre"
 
+/area/crew_quarters/theatre/clown
+	name = "Clown's Office"
+
+/area/crew_quarters/theatre/mime
+	name = "Mime's Office"
+
+/area/crew_quarters/cryopod
+	name = "Cryogenics"
+	icon_state = "cryosleep"
+
 /area/library
 	name = "Library"
 	icon_state = "library"

modular_citadel/code/game/area/cit_areas.dm

@@ -1,18 +0,0 @@
-/area/maintenance/bar
-	name = "Maintenance Bar"
-	icon = 'modular_citadel/code/game/area/areas.dmi'
-	icon_state = "maintbar"
-
-/area/maintenance/bar/cafe
-	name = "Abandoned Cafe"
-
-/area/crew_quarters/theatre/clown
-	name = "Clown's Office"
-
-/area/crew_quarters/theatre/mime
-	name = "Mime's Office"
-
-/area/crew_quarters/cryopod
-	name = "Cryogenics"
-	icon = 'modular_citadel/code/game/area/areas.dmi'
-	icon_state = "cryo"

tgstation.dme

@@ -2987,7 +2987,6 @@
 #include "modular_citadel\code\datums\traits\negative.dm"
 #include "modular_citadel\code\datums\wires\airlock.dm"
 #include "modular_citadel\code\datums\wires\autoylathe.dm"
-#include "modular_citadel\code\game\area\cit_areas.dm"
 #include "modular_citadel\code\game\gamemodes\gangs\dominator.dm"
 #include "modular_citadel\code\game\gamemodes\gangs\dominator_countdown.dm"
 #include "modular_citadel\code\game\gamemodes\gangs\gang.dm"