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
+5
View File
@@ -1205,6 +1205,7 @@
if(I)
I.loc = locker
I.layer = initial(I.layer)
I.plane = initial(I.plane)
I.dropped(M)
M.update_icons()
@@ -1266,6 +1267,7 @@
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
I.plane = initial(I.plane)
I.dropped(M)
M.Paralyse(5)
@@ -1295,6 +1297,7 @@
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
I.plane = initial(I.plane)
I.dropped(M)
M.Paralyse(5)
@@ -1346,6 +1349,7 @@
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
I.plane = initial(I.plane)
I.dropped(M)
if(istype(M, /mob/living/carbon/human))
@@ -2264,6 +2268,7 @@
W.loc = H.loc
W.dropped(H)
W.layer = initial(W.layer)
W.plane = initial(W.plane)
//teleport person to cell
H.loc = pick(prisonwarp)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), slot_w_uniform)