cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4610 from monster860/ui_plane

Browse Source 
Puts UI on it's own plane
This commit is contained in:
TheDZD
2016-06-19 13:38:01 -04:00
committed by GitHub
parent e297ec72fd 3295020088
commit 36aaa78b76
29 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+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)
code/modules/flufftext/Hallucination.dm
+1
View File
@@ -693,6 +693,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
if(slots_free.len)
halitem.screen_loc = pick(slots_free)
halitem.layer = 50
halitem.plane = HUD_PLANE
switch(rand(1,6))
if(1) //revolver
halitem.icon = 'icons/obj/guns/projectile.dmi'
code/modules/mining/equipment_locker.dm
+1
View File
@@ -292,6 +292,7 @@
s.use(s.max_amount)
s.forceMove(loc)
s.layer = initial(s.layer)
s.plane = initial(s.plane)
/obj/machinery/mineral/ore_redemption/power_change()
..()
code/modules/mob/inventory.dm
+4
View File
@@ -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
+3
View File
@@ -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
+1
View File
@@ -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
+3
View File
@@ -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
+1
View File
@@ -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
+3
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -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
code/modules/paperwork/paper.dm
+2
View File
@@ -398,12 +398,14 @@
h_user.unEquip(src)
B.loc = h_user
B.layer = 20
B.plane = HUD_PLANE
h_user.l_store = B
h_user.update_inv_pockets()
else if (h_user.r_store == src)
h_user.unEquip(src)
B.loc = h_user
B.layer = 20
B.plane = HUD_PLANE
h_user.r_store = B
h_user.update_inv_pockets()
else if (h_user.head == src)
code/modules/paperwork/paper_bundle.dm
+1
View File
@@ -204,6 +204,7 @@
for(var/obj/O in src)
O.loc = usr.loc
O.layer = initial(O.layer)
O.plane = initial(O.plane)
O.add_fingerprint(usr)
usr.unEquip(src)
qdel(src)
code/modules/power/singularity/collector.dm
+1
View File
@@ -113,6 +113,7 @@ var/global/list/rad_collectors = list()
return
Z.loc = get_turf(src)
Z.layer = initial(Z.layer)
Z.plane = initial(Z.plane)
src.P = null
if(active)
toggle_power()