Fixed the map/code issues that the body bags caused.

/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e

code/unused/_debug.dm

@@ -23,10 +23,10 @@
 	if(Debug)
 		for(var/turf/T in range(5))
 
-			var/obj/effects/mark/O = locate(/obj/effects/mark/, T)
+			var/obj/effect/mark/O = locate(/obj/effect/mark/, T)
 
 			if(!O)
-				O = new /obj/effects/mark(T)
+				O = new /obj/effect/mark(T)
 			else
 				O.overlays = null
 
@@ -90,7 +90,7 @@ Doing this because FindTurfs() isn't even used
 	set category = "Debug"
 	//set hidden = 1
 	if(Debug)
-		for(var/obj/effects/mark/O in world)
+		for(var/obj/effect/mark/O in world)
 			del(O)
 	else
 		alert("Debugging off")
@@ -132,10 +132,10 @@ Doing this because FindTurfs() isn't even used
 	set category = "Debug"
 	for(var/turf/T in range(5))
 
-		var/obj/effects/mark/O = locate(/obj/effects/mark/, T)
+		var/obj/effect/mark/O = locate(/obj/effect/mark/, T)
 
 		if(!O)
-			O = new /obj/effects/mark(T)
+			O = new /obj/effect/mark(T)
 		else
 			O.overlays = null
 
@@ -163,10 +163,10 @@ Doing this because FindTurfs() isn't even used
 			if(M && M.p_dir)
 
 				//world << "Accepted"
-				var/obj/effects/mark/O = locate(/obj/effects/mark/, T)
+				var/obj/effect/mark/O = locate(/obj/effect/mark/, T)
 
 				if(!O)
-					O = new /obj/effects/mark(T)
+					O = new /obj/effect/mark(T)
 				else
 					O.overlays = null
 
@@ -194,10 +194,10 @@ Doing this because FindTurfs() isn't even used
 
 			//world << "Turf [T] at ([T.x],[T.y])"
 
-			var/obj/effects/mark/O = locate(/obj/effects/mark/, T)
+			var/obj/effect/mark/O = locate(/obj/effect/mark/, T)
 
 			if(!O)
-				O = new /obj/effects/mark(T)
+				O = new /obj/effect/mark(T)
 			else
 				O.overlays = null
 
@@ -206,10 +206,10 @@ Doing this because FindTurfs() isn't even used
 				//world <<" Mach [M] with pdir=[M.p_dir]"
 
 
-				if(M && istype(M, /obj/station_objects/cable/))
+				if(M && istype(M, /obj/structure/cable/))
 
 
-					var/obj/station_objects/cable/C = M
+					var/obj/structure/cable/C = M
 					//world << "Accepted"
 
 					O.overlays += numbericon("[C.netnum]  " ,  marked)
@@ -237,10 +237,10 @@ Doing this because FindTurfs() isn't even used
 
 			//world << "Turf [T] at ([T.x],[T.y])"
 
-			var/obj/effects/mark/O = locate(/obj/effects/mark/, T)
+			var/obj/effect/mark/O = locate(/obj/effect/mark/, T)
 
 			if(!O)
-				O = new /obj/effects/mark(T)
+				O = new /obj/effect/mark(T)
 			else
 				O.overlays = null
 
@@ -277,7 +277,7 @@ Doing this because FindTurfs() isn't even used
 
 			T = get_step(P, ndirs[1])
 
-			var/obj/effects/mark/O = new(T)
+			var/obj/effect/mark/O = new(T)
 
 			O.overlays += numbericon("[num] * 1  ", -4)
 			O.overlays += numbericon("[ndirs[1]] - [ndirs[2]]",-16)
@@ -497,7 +497,7 @@ Doing this because FindTurfs() isn't even used
 /mob/verb/Smoke()
 	set category = "Debug"
 	if(Debug)
-		var/obj/effects/smoke/O = new /obj/effects/smoke( src.loc )
+		var/obj/effect/smoke/O = new /obj/effect/smoke( src.loc )
 		O.dir = pick(NORTH, SOUTH, EAST, WEST)
 		spawn( 0 )
 			O.Life()

code/unused/assemblies.dm

@@ -140,7 +140,7 @@
 	src.part2.Activate()
 	return
 
-/obj/effects/decal/ash/attack_hand(mob/user as mob)
+/obj/effect/decal/ash/attack_hand(mob/user as mob)
 	usr << "\blue The ashes slip through your fingers."
 	del(src)
 	return
@@ -370,7 +370,7 @@
 	return
 
 /obj/item/assembly/rad_prox/HasProximity(atom/movable/AM as mob|obj)
-	if (istype(AM, /obj/effects/beam))
+	if (istype(AM, /obj/effect/beam))
 		return
 	if (AM.move_speed < 12)
 		src.part2.sense()
@@ -504,7 +504,7 @@
 
 /obj/item/assembly/prox_ignite/HasProximity(atom/movable/AM as mob|obj)
 
-	if (istype(AM, /obj/effects/beam))
+	if (istype(AM, /obj/effect/beam))
 		return
 	if (AM.move_speed < 12 && src.part1)
 		src.part1.sense()
@@ -619,7 +619,7 @@
 	return
 
 /obj/item/assembly/m_i_ptank/HasProximity(atom/movable/AM as mob|obj)
-	if (istype(AM, /obj/effects/beam))
+	if (istype(AM, /obj/effect/beam))
 		return
 	if (AM.move_speed < 12 && src.part1)
 		src.part1.sense()

code/unused/carpetsplosion.dm

@@ -1,10 +1,10 @@
 /proc/carpetsplosion(turf/location as turf,range = 10)
-	var/obj/effects/spreader/spreadEpicentre = new /obj/effects/spreader(location,range)
+	var/obj/effect/spreader/spreadEpicentre = new /obj/effect/spreader(location,range)
 	var/list/turf/spreadTurfs = list()
 
 	sleep(5)
 
-	for(var/obj/effects/spreader/spread in spreadEpicentre.spreadList)
+	for(var/obj/effect/spreader/spread in spreadEpicentre.spreadList)
 		spreadTurfs += get_turf(spread)
 
 	del(spreadEpicentre)
@@ -18,16 +18,16 @@
 
 //DEBUG END
 
-/obj/effects/spreader
-	var/list/obj/effects/spreader/spreadList = list()
+/obj/effect/spreader
+	var/list/obj/effect/spreader/spreadList = list()
 
-/obj/effects/spreader/Del()
-	for(var/obj/effects/spreader/spread in spreadList)
+/obj/effect/spreader/Del()
+	for(var/obj/effect/spreader/spread in spreadList)
 		if(spread != src)
 			del(spread)
 	..()
 
-/obj/effects/spreader/New(location,var/amount = 1,obj/effects/spreader/source = src) //just a copypaste job from foam
+/obj/effect/spreader/New(location,var/amount = 1,obj/effects/spreader/source = src) //just a copypaste job from foam
 	if(amount <= 0)
 		del(src)
 		return
@@ -42,16 +42,16 @@
 			if(!T.Enter(src))
 				continue
 
-			var/obj/effects/spreader/S = locate() in T
+			var/obj/effect/spreader/S = locate() in T
 			if(S)
 				continue
 
-			new /obj/effects/spreader(T,amount-1,source)
+			new /obj/effect/spreader(T,amount-1,source)
 
 		source.spreadList += src
 
 /*
-/obj/effects/foam/proc/process()
+/obj/effect/foam/proc/process()
 	if(--amount < 0)
 		return
 
@@ -68,7 +68,7 @@
 			if(!T.Enter(src))
 				continue
 
-			var/obj/effects/foam/F = locate() in T
+			var/obj/effect/foam/F = locate() in T
 			if(F)
 				continue
 

code/unused/gamemodes/ruby.dm

@@ -34,7 +34,7 @@
 			var/starting_loc = pick(wizardstart)
 			wizard.current.loc = starting_loc
 
-	for (var/obj/effects/landmark/A in world)
+	for (var/obj/effect/landmark/A in world)
 		if (A.name == "Teleport-Scroll")
 			new /obj/item/weapon/teleportation_scroll(A.loc)
 			del(A)

code/unused/mining/mine_generator_unused.dm

@@ -1,7 +1,7 @@
 /**********************Random mine generator************************/
 
 //this item is intended to give the effect of entering the mine, so that light gradually fades
-/obj/effects/mine_generator
+/obj/effect/mine_generator
 	name = "Random mine generator"
 	anchored = 1
 	unacidable = 1
@@ -31,7 +31,7 @@
 		16 = NNE
 	*/
 
-/obj/effects/mine_generator/New()
+/obj/effect/mine_generator/New()
 	last_loc = src.loc
 	var/i
 	for(i = 0; i < 50; i++)
@@ -42,7 +42,7 @@
 	return
 
 
-/obj/effects/mine_generator/proc/gererateTargetLoc()  //this proc determines where the next square-room will end.
+/obj/effect/mine_generator/proc/gererateTargetLoc()  //this proc determines where the next square-room will end.
 	switch(mineDirection)
 		if(1)
 			randXParam = 0
@@ -119,7 +119,7 @@
 	return
 
 
-/obj/effects/mine_generator/proc/fillWithAsteroids()
+/obj/effect/mine_generator/proc/fillWithAsteroids()
 
 	if(last_loc)
 		start_loc = last_loc

code/unused/optics/beam.dm

@@ -1,7 +1,7 @@
 // the laser beam
 
 
-/obj/effects/beam/laser
+/obj/effect/beam/laser
 	name = "laser beam"
 	icon = 'beam.dmi'
 	icon_state = "full"
@@ -12,8 +12,8 @@
 	var/wavelength 		// the (vaccuum) wavelength of the beam
 	var/width = 1		// 1=thin, 2=medium, 3=wide
 
-	var/obj/effects/beam/laser/next
-	var/obj/effects/beam/laser/prev
+	var/obj/effect/beam/laser/next
+	var/obj/effect/beam/laser/prev
 	var/obj/master
 
 	New(var/atom/newloc, var/dirn, var/lambda, var/omega=1, var/half=0)
@@ -97,7 +97,7 @@
 
 
 	HasEntered(var/atom/movable/AM)
-		if(istype(AM, /obj/effects/beam))
+		if(istype(AM, /obj/effect/beam))
 			return
 		if(blocked(AM))
 			remove(src)

code/unused/optics/laser-pointer.dm

@@ -19,7 +19,7 @@
 	g_amt = 100
 	w_amt = 200
 
-	var/obj/effects/beam/laser/beam 	// the created beam
+	var/obj/effect/beam/laser/beam 	// the created beam
 
 	flags = FPRINT | CONDUCT | TABLEPASS
 

code/unused/spacecraft/shipcore.dm

@@ -94,7 +94,7 @@
 		for(var/turf/T in src.turfs)
 
 			for(var/obj/O in T)
-				if(istype(O, /obj/effects/ship_landing_beacon)) // Leave beacons where they are, we don't want to take them with us.
+				if(istype(O, /obj/effect/ship_landing_beacon)) // Leave beacons where they are, we don't want to take them with us.
 					continue
 				var/
 					_x = Center.x + O.x - xsav
@@ -172,8 +172,8 @@ obj/machinery/shipcore/Topic(href, href_list)
 		src.group_self()
 	if (href_list["move"])
 		var/list/beacons = list()
-		for(var/obj/effects/ship_landing_beacon/b in world)
-			if(istype(b, /obj/effects/ship_landing_beacon))
+		for(var/obj/effect/ship_landing_beacon/b in world)
+			if(istype(b, /obj/effect/ship_landing_beacon))
 				if(b.active)
 					beacons.Add(b)
 		if(!beacons.len)
@@ -330,7 +330,7 @@ obj/machinery/ship_component/control_panel
 	icon = 'craft.dmi'
 	icon_state = "ship_overlay"
 
-/obj/effects/ship_landing_beacon
+/obj/effect/ship_landing_beacon
 	icon = 'craft.dmi'
 	icon_state = "beacon"
 	name = "Beacon"