From 5765aac899371109a863d31ace0ed4eeedd83e31 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Wed, 13 Jun 2012 17:28:03 -0700
Subject: [PATCH] Fuck it, good enough for now.

---
 code/game/area/areas.dm               | 21 +++++++++++++++++----
 code/game/objects/items/blueprints.dm |  4 +++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 18967989a51..629e420d529 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -395,14 +395,27 @@
 /area/proc/absorb(var/area/A)
 	if(!istype(A))
 		return
+	var/oldname = A.name
+	var/list/other_related = A.related
+	var/area/other_master = A.master
+	other_related -= other_master
 	var/list/total_contents = list()
-	for(var/area/RA in A.related)
+	for(var/area/RA in other_related)
+		RA.sd_lighting = 0
 		total_contents |= RA.contents
-		RA.contents = list()
+		del RA.contents
+		del RA.related
+		RA.master = null
+	other_master.master = null
+	del other_master.related
+	total_contents |= other_master.contents
+	del other_master.contents
+	for(var/area/RA in other_related)
+		del(RA)
 	src += total_contents
 	spawn(5)
 		power_change()
-		set_area_machinery_title()
+		set_area_machinery_title(oldname)
 
 
 /area/proc/set_area_machinery_title(var/oldtitle)
@@ -418,4 +431,4 @@
 		for(var/obj/machinery/atmospherics/unary/vent_pump/M in RA)
 			M.name = dd_replacetext(M.name,oldtitle,name)
 		for(var/obj/machinery/door/M in RA)
-			M.name = dd_replacetext(M.name,oldtitle,name)
+			M.name = dd_replacetext(M.name,oldtitle,name)
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 11ea1670586..575c49d81c6 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -220,6 +220,8 @@ move an amendment</a> to the designs.</p>
 
 
 		if("Merge")
+			usr << "We appologize, but this function is not availible"
+			/*
 			var/list/turf/search_remaining_turfs = A.contents.Copy()
 			var/list/turfs = list()
 			for(var/turf/simulated/T in search_remaining_turfs)
@@ -316,7 +318,7 @@ move an amendment</a> to the designs.</p>
 					return
 
 			else
-				return
+				return*/
 
 		if("Cancel")
 			return