Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00
parent 4f4fe98240 a6a4deb94c
commit 04d071deda
252 changed files with 6549 additions and 5230 deletions
@@ -143,3 +143,18 @@

 /area/ctf/flag_room2
 	name = "Flag Room B"
+
+// REEBE
+
+/area/reebe
+	name = "Reebe"
+	icon_state = "yellow"
+	requires_power = FALSE
+	has_gravity = TRUE
+	noteleport = TRUE
+	hidden = TRUE
+
+/area/reebe/city_of_cogs
+	name = "City of Cogs"
+	icon_state = "purple"
+	hidden = FALSE