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/game/objects/items/blueprints.dm

@@ -185,7 +185,7 @@ move an amendment</a> to the drawing.</p>
 	if (!istype(T2, /turf/simulated))
 		return BORDER_BETWEEN
 
-	for (var/obj/station_objects/window/W in T2)
+	for (var/obj/structure/window/W in T2)
 		if(turn(dir,180) == W.dir)
 			return BORDER_BETWEEN
 		if (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST))
@@ -195,9 +195,9 @@ move an amendment</a> to the drawing.</p>
 			return BORDER_BETWEEN
 	if (locate(/obj/machinery/door) in T2)
 		return BORDER_2NDTILE
-	if (locate(/obj/station_objects/falsewall) in T2)
+	if (locate(/obj/structure/falsewall) in T2)
 		return BORDER_2NDTILE
-	if (locate(/obj/station_objects/falserwall) in T2)
+	if (locate(/obj/structure/falserwall) in T2)
 		return BORDER_2NDTILE
 
 	return BORDER_NONE
@@ -212,7 +212,7 @@ move an amendment</a> to the drawing.</p>
 		pending -= T
 		for (var/dir in cardinal)
 			var/skip = 0
-			for (var/obj/station_objects/window/W in T)
+			for (var/obj/structure/window/W in T)
 				if(dir == W.dir || (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST)))
 					skip = 1; break
 			if (skip) continue

code/game/objects/items/shock_kit.dm

@@ -49,8 +49,8 @@
 /obj/item/assembly/shock_kit/receive_signal()
 	//*****
 	//world << "Shock kit got r_signal"
-	if (istype(src.loc, /obj/station_objects/stool/chair/e_chair))
-		var/obj/station_objects/stool/chair/e_chair/C = src.loc
+	if (istype(src.loc, /obj/structure/stool/chair/e_chair))
+		var/obj/structure/stool/chair/e_chair/C = src.loc
 		//world << "Shock kit sending shock to EC"
 		C.shock()
 	return

code/game/objects/items/weapons/RCD.dm

@@ -19,7 +19,7 @@ RCD
 	m_amt = 50000
 	origin_tech = "engineering=4;materials=2"
 	var
-		datum/effects/system/spark_spread/spark_system
+		datum/effect/system/spark_spread/spark_system
 		matter = 0
 		working = 0
 		mode = 1
@@ -28,7 +28,7 @@ RCD
 
 	New()
 		desc = "A RCD. It currently holds [matter]/30 matter-units."
-		src.spark_system = new /datum/effects/system/spark_spread
+		src.spark_system = new /datum/effect/system/spark_spread
 		spark_system.set_up(5, 0, src)
 		spark_system.attach(src)
 		return
@@ -116,7 +116,7 @@ RCD
 					src.spark_system.start()
 					if(locate(/obj/machinery/door) in get_turf(src))	return
 					var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock( A )
-					var/obj/station_objects/window/killthis = (locate(/obj/station_objects/window) in get_turf(src))
+					var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src))
 					if(killthis)
 						killthis.ex_act(2)//Smashin windows
 					T.autoclose = 1

code/game/objects/items/weapons/RSF.dm

@@ -49,11 +49,11 @@ RSF
 	// Change mode
 
 /obj/item/weapon/rsf/afterattack(atom/A, mob/user as mob)
-	if (!(istype(A, /obj/station_objects/table) || istype(A, /turf/simulated/floor)))
+	if (!(istype(A, /obj/structure/table) || istype(A, /turf/simulated/floor)))
 		return
 
-	if (istype(A, /obj/station_objects/table) && mode == 1)
-		if (istype(A, /obj/station_objects/table) && matter >= 1)
+	if (istype(A, /obj/structure/table) && mode == 1)
+		if (istype(A, /obj/structure/table) && matter >= 1)
 			user << "Dispensing Dosh..."
 			playsound(src.loc, 'click.ogg', 10, 1)
 			new /obj/item/weapon/spacecash/c10( A.loc )
@@ -80,8 +80,8 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/station_objects/table) && mode == 2)
-		if (istype(A, /obj/station_objects/table) && matter >= 1)
+	else if (istype(A, /obj/structure/table) && mode == 2)
+		if (istype(A, /obj/structure/table) && matter >= 1)
 			user << "Dispensing Drinking Glass..."
 			playsound(src.loc, 'click.ogg', 10, 1)
 			new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc )
@@ -108,8 +108,8 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/station_objects/table) && mode == 3)
-		if (istype(A, /obj/station_objects/table) && matter >= 1)
+	else if (istype(A, /obj/structure/table) && mode == 3)
+		if (istype(A, /obj/structure/table) && matter >= 1)
 			user << "Dispensing Paper Sheet..."
 			playsound(src.loc, 'click.ogg', 10, 1)
 			new /obj/item/weapon/paper( A.loc )
@@ -136,8 +136,8 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/station_objects/table) && mode == 4)
-		if (istype(A, /obj/station_objects/table) && matter >= 1)
+	else if (istype(A, /obj/structure/table) && mode == 4)
+		if (istype(A, /obj/structure/table) && matter >= 1)
 			user << "Dispensing Pen..."
 			playsound(src.loc, 'click.ogg', 10, 1)
 			new /obj/item/weapon/pen( A.loc )
@@ -164,8 +164,8 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/station_objects/table) && mode == 5)
-		if (istype(A, /obj/station_objects/table) && matter >= 1)
+	else if (istype(A, /obj/structure/table) && mode == 5)
+		if (istype(A, /obj/structure/table) && matter >= 1)
 			user << "Dispensing Dice Pack..."
 			playsound(src.loc, 'click.ogg', 10, 1)
 			new /obj/item/weapon/storage/dice( A.loc )
@@ -192,8 +192,8 @@ RSF
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return
 
-	else if (istype(A, /obj/station_objects/table) && mode == 6)
-		if (istype(A, /obj/station_objects/table) && matter >= 1)
+	else if (istype(A, /obj/structure/table) && mode == 6)
+		if (istype(A, /obj/structure/table) && matter >= 1)
 			user << "Dispensing Cigarette..."
 			playsound(src.loc, 'click.ogg', 10, 1)
 			new /obj/item/clothing/mask/cigarette( A.loc )

code/game/objects/items/weapons/clown_items.dm

@@ -44,7 +44,7 @@ BIKE HORN
 		M.weakened = 5
 
 /obj/item/weapon/soap/afterattack(atom/target, mob/user as mob)
-	if(istype(target,/obj/effects/decal/cleanable))
+	if(istype(target,/obj/effect/decal/cleanable))
 		del(target)
 		user << "\blue You scrub the [target.name] out."
 	else

code/game/objects/items/weapons/dna_injector.dm

@@ -63,7 +63,7 @@
 
 	if (user)
 		if (istype(M, /mob/living/carbon/human))
-			var/obj/effects/equip_e/human/O = new /obj/effects/equip_e/human(  )
+			var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human(  )
 			O.source = user
 			O.target = M
 			O.item = src

code/game/objects/items/weapons/grenades.dm

@@ -220,7 +220,7 @@ FLASHBANG
 					M << "\red Your ears start to ring!"
 
 //Blob damage here
-		for(var/obj/effects/blob/B in view(8,T))
+		for(var/obj/effect/blob/B in view(8,T))
 			var/damage = round(30/(get_dist(B,T)+1))
 			B.health -= damage
 			B.update()

code/game/objects/items/weapons/hydroponics.dm

@@ -23,7 +23,7 @@ Deathnettle
 	if (istype(A, /obj/item/weapon/storage/backpack ))
 		return
 
-	else if (locate (/obj/station_objects/table, src.loc))
+	else if (locate (/obj/structure/table, src.loc))
 		return
 
 	else if (src.reagents.total_volume < 1)
@@ -37,11 +37,11 @@ Deathnettle
 		if (istype(A, /obj/machinery/hydroponics)) // We are targeting hydrotray
 			return
 
-		else if (istype(A, /obj/effects/blob)) // blob damage in blob code
+		else if (istype(A, /obj/effect/blob)) // blob damage in blob code
 			return
 
 		else
-			var/obj/effects/decal/D = new/obj/effects/decal/(get_turf(src)) // Targeting elsewhere
+			var/obj/effect/decal/D = new/obj/effect/decal/(get_turf(src)) // Targeting elsewhere
 			D.name = "chemicals"
 			D.icon = 'chemical.dmi'
 			D.icon_state = "weedpuff"

code/game/objects/items/weapons/mops_cleaners.dm

@@ -16,13 +16,13 @@ MOP
 /obj/item/weapon/cleaner/afterattack(atom/A as mob|obj, mob/user as mob)
 	if (istype(A, /obj/item/weapon/storage/backpack ))
 		return
-	if (istype(A, /obj/effects/proc_holder/spell ))
+	if (istype(A, /obj/effect/proc_holder/spell ))
 		return
 	else if (src.reagents.total_volume < 1)
 		user << "\blue [src] is empty!"
 		return
 
-	var/obj/effects/decal/D = new/obj/effects/decal(get_turf(src))
+	var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
 	D.create_reagents(5)
 	src.reagents.trans_to(D, 5)
 
@@ -93,7 +93,7 @@ MOP
 /obj/item/weapon/chemsprayer/afterattack(atom/A as mob|obj, mob/user as mob)
 	if (istype(A, /obj/item/weapon/storage/backpack ))
 		return
-	if (istype(A, /obj/effects/proc_holder/spell ))
+	if (istype(A, /obj/effect/proc_holder/spell ))
 		return
 	else if (src.reagents.total_volume < 1)
 		user << "\blue [src] is empty!"
@@ -104,7 +104,7 @@ MOP
 	var/Sprays[3]
 	for(var/i=1, i<=3, i++) // intialize sprays
 		if(src.reagents.total_volume < 1) break
-		var/obj/effects/decal/D = new/obj/effects/decal(get_turf(src))
+		var/obj/effect/decal/D = new/obj/effect/decal(get_turf(src))
 		D.name = "chemicals"
 		D.icon = 'chempuff.dmi'
 		D.create_reagents(5)
@@ -140,7 +140,7 @@ MOP
 
 	for(var/i=1, i<=Sprays.len, i++)
 		spawn()
-			var/obj/effects/decal/D = Sprays[i]
+			var/obj/effect/decal/D = Sprays[i]
 			if(!D) continue
 
 			// Spreads the sprays a little bit
@@ -190,12 +190,12 @@ MOP
 		user << "\blue You have finished mopping!"
 		src.reagents.reaction(A,1,10)
 		A.clean_blood()
-		for(var/obj/effects/rune/R in A)
+		for(var/obj/effect/rune/R in A)
 			del(R)
-		for(var/obj/effects/decal/cleanable/crayon/R in A)
+		for(var/obj/effect/decal/cleanable/crayon/R in A)
 			del(R)
 		mopcount++
-	else if (istype(A, /obj/effects/decal/cleanable/blood) || istype(A, /obj/effects/overlay) || istype(A, /obj/effects/decal/cleanable/xenoblood) || istype(A, /obj/effects/rune) || istype(A,/obj/effects/decal/cleanable/crayon) || istype(A,/obj/effects/decal/cleanable/vomit) )
+	else if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/decal/cleanable/xenoblood) || istype(A, /obj/effect/rune) || istype(A,/obj/effect/decal/cleanable/crayon) || istype(A,/obj/effect/decal/cleanable/vomit) )
 		for(var/mob/O in viewers(user, null))
 			O.show_message(text("\red <B>[user] begins to clean [A]</B>"), 1)
 		sleep(20)

code/game/objects/items/weapons/papers_bins.dm

@@ -423,7 +423,7 @@ CLIPBOARDS
 
 /obj/item/weapon/wrapping_paper/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
-	if (!( locate(/obj/station_objects/table, src.loc) ))
+	if (!( locate(/obj/structure/table, src.loc) ))
 		user << "\blue You MUST put the paper on a table!"
 	if (W.w_class < 4)
 		if ((istype(user.l_hand, /obj/item/weapon/wirecutters) || istype(user.r_hand, /obj/item/weapon/wirecutters)))
@@ -466,7 +466,7 @@ CLIPBOARDS
 	if (!istype(target, /mob/living/carbon/human)) return
 	if (istype(target:wear_suit, /obj/item/clothing/suit/straight_jacket) || target:stat)
 		if (src.amount > 2)
-			var/obj/effects/spresent/present = new /obj/effects/spresent (target:loc)
+			var/obj/effect/spresent/present = new /obj/effect/spresent (target:loc)
 			src.amount -= 2
 
 			if (target:client)
@@ -507,12 +507,12 @@ CLIPBOARDS
 	return
 
 
-/obj/effects/spresent/relaymove(mob/user as mob)
+/obj/effect/spresent/relaymove(mob/user as mob)
 	if (user.stat)
 		return
 	user << "\blue You cant move."
 
-/obj/effects/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
 
 	if (!istype(W, /obj/item/weapon/wirecutters))
@@ -598,23 +598,23 @@ CLIPBOARDS
 
 // BEDSHEET BIN
 
-/obj/station_objects/bedsheetbin/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/bedsheetbin/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/bedsheet))
 		//W = null
 		del(W)
 		src.amount++
 	return
 
-/obj/station_objects/bedsheetbin/attack_paw(mob/user as mob)
+/obj/structure/bedsheetbin/attack_paw(mob/user as mob)
 	return src.attack_hand(user)
 
-/obj/station_objects/bedsheetbin/attack_hand(mob/user as mob)
+/obj/structure/bedsheetbin/attack_hand(mob/user as mob)
 	if (src.amount >= 1)
 		src.amount--
 		new /obj/item/weapon/bedsheet( src.loc )
 		add_fingerprint(user)
 
-/obj/station_objects/bedsheetbin/examine()
+/obj/structure/bedsheetbin/examine()
 	set src in oview(1)
 
 	src.amount = round(src.amount)

code/game/objects/items/weapons/surgery_tools.dm

@@ -16,7 +16,7 @@ CIRCULAR SAW
 	if(!istype(M))
 		return
 
-	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/station_objects/table/, M.loc) && (M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(50))))
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && (M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(50))))
 		return ..()
 
 	if(user.zone_sel.selecting == "groin")
@@ -89,7 +89,7 @@ CIRCULAR SAW
 	if(!istype(M))
 		return
 
-	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/station_objects/table/, M.loc) && M.lying && prob(50))))
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
 		return ..()
 
 	if(user.zone_sel.selecting == "groin")
@@ -174,7 +174,7 @@ CIRCULAR SAW
 	if(!istype(M))
 		return
 
-	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/station_objects/table/, M.loc) && M.lying && prob(50))))
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
 		return ..()
 
 	if(user.zone_sel.selecting == "groin")
@@ -257,7 +257,7 @@ CIRCULAR SAW
 		M = user
 		return eyestab(M,user)
 
-	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/station_objects/table/, M.loc) && M.lying && prob(50))))
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
 		return ..()
 
 	src.add_fingerprint(user)
@@ -454,7 +454,7 @@ CIRCULAR SAW
 		M = user
 		return eyestab(M,user)
 
-	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/station_objects/table/, M.loc) && M.lying && prob(50))))
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
 		return ..()
 
 	src.add_fingerprint(user)

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -55,7 +55,7 @@ STUN BATON
 //Most of the other special functions are handled in their own files.
 
 /obj/item/weapon/melee/energy/blade/New()
-	spark_system = new /datum/effects/system/spark_spread()
+	spark_system = new /datum/effect/system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 	return

code/game/objects/items/weapons/table_rack_parts.dm

@@ -18,7 +18,7 @@ RACK PARTS
 		del(src)
 
 /obj/item/weapon/table_parts/attack_self(mob/user as mob)
-	new /obj/station_objects/table( user.loc )
+	new /obj/structure/table( user.loc )
 	del(src)
 	return
 
@@ -31,7 +31,7 @@ RACK PARTS
 		del(src)
 
 /obj/item/weapon/table_parts/wood/attack_self(mob/user as mob)
-	new /obj/station_objects/table/woodentable( user.loc )
+	new /obj/structure/table/woodentable( user.loc )
 	del(src)
 	return
 
@@ -45,7 +45,7 @@ RACK PARTS
 		del(src)
 
 /obj/item/weapon/table_parts/reinforced/attack_self(mob/user as mob)
-	new /obj/station_objects/table/reinforced( user.loc )
+	new /obj/structure/table/reinforced( user.loc )
 	del(src)
 	return
 
@@ -63,7 +63,7 @@ RACK PARTS
 	return
 
 /obj/item/weapon/rack_parts/attack_self(mob/user as mob)
-	var/obj/station_objects/rack/R = new /obj/station_objects/rack( user.loc )
+	var/obj/structure/rack/R = new /obj/structure/rack( user.loc )
 	R.add_fingerprint(user)
 	del(src)
 	return

code/game/objects/items/weapons/teleportation.dm

@@ -125,7 +125,7 @@ Frequency:
 	if ((user.equipped() != src || user.stat || user.restrained()))
 		return
 	var/count = 0	//num of portals from this teleport in world
-	for(var/obj/effects/portal/PO in world)
+	for(var/obj/effect/portal/PO in world)
 		if(PO.creator == src)	count++
 	if(count >= 3)
 		user.show_message("\red The hand teleporter is recharging!")
@@ -133,7 +133,7 @@ Frequency:
 	var/T = L[t1]
 	for(var/mob/O in hearers(user, null))
 		O.show_message("\blue Locked In", 2)
-	var/obj/effects/portal/P = new /obj/effects/portal( get_turf(src) )
+	var/obj/effect/portal/P = new /obj/effect/portal( get_turf(src) )
 	P.target = T
 	P.creator = src
 	src.add_fingerprint(user)

code/game/objects/items/weapons/tools.dm

@@ -147,12 +147,12 @@ WELDINGTOOOL
 
 
 	afterattack(obj/O as obj, mob/user as mob)
-		if (istype(O, /obj/station_objects/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && !src.welding)
+		if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && !src.welding)
 			O.reagents.trans_to(src, max_fuel)
 			user << "\blue Welder refueled"
 			playsound(src.loc, 'refill.ogg', 50, 1, -6)
 			return
-		else if (istype(O, /obj/station_objects/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding)
+		else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding)
 			message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
 			log_game("[key_name(user)] triggered a fueltank explosion.")
 			user << "\red That was stupid of you."