Merge pull request #4610 from monster860/ui_plane

Puts UI on it's own plane

code/modules/mob/inventory.dm

@@ -28,6 +28,7 @@
 		W.forceMove(src)		//TODO: move to equipped?
 		l_hand = W
 		W.layer = 20	//TODO: move to equipped?
+		W.plane = HUD_PLANE	//TODO: move to equipped?
 		W.equipped(src,slot_l_hand)
 		if(pulling == W)
 			stop_pulling()
@@ -43,6 +44,7 @@
 		W.forceMove(src)
 		r_hand = W
 		W.layer = 20
+		W.plane = HUD_PLANE
 		W.equipped(src,slot_r_hand)
 		if(pulling == W)
 			stop_pulling()
@@ -72,6 +74,7 @@
 /mob/proc/put_in_hands(obj/item/W)
 	W.forceMove(get_turf(src))
 	W.layer = initial(W.layer)
+	W.plane = initial(W.plane)
 	W.dropped()
 
 /mob/proc/drop_item_v()		//this is dumb.
@@ -124,6 +127,7 @@
 		I.dropped(src)
 		if(I)
 			I.layer = initial(I.layer)
+			I.plane = initial(I.plane)
 	return 1
 
 

code/modules/mob/living/carbon/carbon.dm

@@ -455,6 +455,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	for(var/obj/machinery/atmospherics/A in totalMembers)
 		if(!A.pipe_image)
 			A.pipe_image = image(A, A.loc, layer = 20, dir = A.dir) //the 20 puts it above Byond's darkness (not its opacity view)
+			A.pipe_image.plane = HUD_PLANE
 		pipes_shown += A.pipe_image
 		client.images += A.pipe_image
 
@@ -902,6 +903,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 			W.dropped(src)
 			if (W)
 				W.layer = initial(W.layer)
+				W.plane = initial(W.plane)
 	if (legcuffed)
 		var/obj/item/weapon/W = legcuffed
 		legcuffed = null
@@ -913,6 +915,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 			W.dropped(src)
 			if (W)
 				W.layer = initial(W.layer)
+				W.plane = initial(W.plane)
 
 
 /mob/living/carbon/proc/slip(var/description, var/stun, var/weaken, var/tilesSlipped, var/walkSafely, var/slipAny)

code/modules/mob/living/carbon/give.dm

@@ -49,6 +49,7 @@
 						target.l_hand = I
 				I.loc = target
 				I.layer = 20
+				I.plane = HUD_PLANE
 				I.add_fingerprint(target)
 				src.update_inv_l_hand()
 				src.update_inv_r_hand()

code/modules/mob/living/carbon/human/inventory.dm

@@ -218,6 +218,7 @@
 	W.loc = src
 	W.equipped(src, slot)
 	W.layer = 20
+	W.plane = HUD_PLANE
 
 	switch(slot)
 		if(slot_back)
@@ -260,6 +261,7 @@
 				O.loc = src
 				r_ear = O
 				O.layer = 20
+				O.plane = HUD_PLANE
 			update_inv_ears(redraw_mob)
 		if(slot_r_ear)
 			r_ear = W
@@ -268,6 +270,7 @@
 				O.loc = src
 				l_ear = O
 				O.layer = 20
+				O.plane = HUD_PLANE
 			update_inv_ears(redraw_mob)
 		if(slot_glasses)
 			glasses = W

code/modules/mob/living/carbon/human/update_icons.dm

@@ -639,6 +639,7 @@ var/global/list/damage_icon_parts = list()
 					thing.loc = loc																//
 					thing.dropped(src)															//
 					thing.layer = initial(thing.layer)
+					thing.plane = initial(thing.plane)
 	if(update_icons)   update_icons()
 
 /mob/living/carbon/human/update_inv_wear_id(var/update_icons=1)

code/modules/mob/living/silicon/robot/inventory.dm

@@ -56,6 +56,7 @@
 		O.mouse_opacity = initial(O.mouse_opacity)
 		module_state_1 = O
 		O.layer = 20
+		O.plane = HUD_PLANE
 		O.screen_loc = inv1.screen_loc
 		contents += O
 		if(istype(module_state_1,/obj/item/borg/sight))
@@ -64,6 +65,7 @@
 		O.mouse_opacity = initial(O.mouse_opacity)
 		module_state_2 = O
 		O.layer = 20
+		O.plane = HUD_PLANE
 		O.screen_loc = inv2.screen_loc
 		contents += O
 		if(istype(module_state_2,/obj/item/borg/sight))
@@ -72,6 +74,7 @@
 		O.mouse_opacity = initial(O.mouse_opacity)
 		module_state_3 = O
 		O.layer = 20
+		O.plane = HUD_PLANE
 		O.screen_loc = inv3.screen_loc
 		contents += O
 		if(istype(module_state_3,/obj/item/borg/sight))

code/modules/mob/living/simple_animal/friendly/diona.dm

@@ -243,6 +243,7 @@
 /mob/living/simple_animal/diona/put_in_hands(obj/item/W)
 	W.loc = get_turf(src)
 	W.layer = initial(W.layer)
+	W.plane = initial(W.plane)
 	W.dropped()
 
 /mob/living/simple_animal/diona/put_in_active_hand(obj/item/W)

code/modules/mob/mob_grab.dm

@@ -23,6 +23,7 @@
 	var/dancing //determines if assailant and affecting keep looking at each other. Basically a wrestling position
 
 	layer = 21
+	plane = HUD_PLANE
 	item_state = "nothing"
 	icon = 'icons/mob/screen_gen.dmi'
 	w_class = 5.0