Merge pull request #4610 from monster860/ui_plane

Puts UI on it's own plane
This commit is contained in:
TheDZD
2016-06-19 13:38:01 -04:00
committed by GitHub
29 changed files with 60 additions and 2 deletions
@@ -6,6 +6,7 @@
density = 0
anchored = 1
layer = 20 //DEBUG
plane = HUD_PLANE //DEBUG
var/health = 10
var/stage = 1
var/obj/effect/rift/originalRift = null //the originating rift of that biomass
+1
View File
@@ -12,6 +12,7 @@
density = 0
anchored = 1
layer = 50
plane = HUD_PLANE
/obj/effect/decal/chempuff
name = "chemicals"
+1
View File
@@ -31,6 +31,7 @@
icon_state = "blank"
anchored = 1
layer = 99
plane = HUD_PLANE
mouse_opacity = 0
unacidable = 1//Just to be sure.
@@ -165,10 +165,12 @@
P.loc = usr
usr.r_hand = P
P.layer = 20
P.plane = HUD_PLANE
else if(!usr.l_hand)
P.loc = usr
usr.l_hand = P
P.layer = 20
P.plane = HUD_PLANE
if(istype(usr,/mob/living/carbon/human))
usr:update_inv_l_hand()
@@ -151,6 +151,7 @@
for(var/obj/O in src.contents)
O.screen_loc = "[cx],[cy]"
O.layer = 20
O.plane = HUD_PLANE
cx++
if (cx > mx)
cx = tx
@@ -170,6 +171,7 @@
ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
ND.sample_object.maptext = "<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>"
ND.sample_object.layer = 20
ND.sample_object.plane = HUD_PLANE
cx++
if (cx > (4+cols))
cx = 4
@@ -180,6 +182,7 @@
O.screen_loc = "[cx]:16,[cy]:16"
O.maptext = ""
O.layer = 20
O.plane = HUD_PLANE
cx++
if (cx > (4+cols))
cx = 4
@@ -337,8 +340,10 @@
W.dropped(usr)
if(ismob(new_location))
W.layer = 20
W.plane = HUD_PLANE
else
W.layer = initial(W.layer)
W.plane = initial(W.plane)
W.loc = new_location
else
W.loc = get_turf(src)
@@ -445,6 +450,7 @@
src.closer.master = src
src.closer.icon_state = "x"
src.closer.layer = 20
src.closer.plane = HUD_PLANE
orient2hud()
return