cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake

Browse Source 
Revert "Move some stuff from different layers to different planes"
This commit is contained in:
Jordie
2016-04-30 15:34:17 +10:00
parent e5541ed361 0bbcc00c4d
commit 53fd10c54b
41 changed files with 108 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+3
View File
@@ -1386,6 +1386,7 @@
M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
I.dropped(M)
M.Paralyse(5)
@@ -1415,6 +1416,7 @@
M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
I.dropped(M)
M.Paralyse(5)
@@ -1467,6 +1469,7 @@
M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
I.dropped(M)
if(istype(M, /mob/living/carbon/human))
code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+2 -6
View File
@@ -259,9 +259,7 @@
user.visible_message("[user] unwelds the vent.", "<span class='notice'>You unweld the vent.</span>", "<span class='italics'>You hear welding.</span>")
welded = 0
update_icon()
var/image/I = image(src, loc, dir = dir)
I.plane = PLANE_UI_OBJECTS
pipe_vision_img = I
pipe_vision_img = image(src, loc, layer = 20, dir = dir)
return 0
else
return ..()
@@ -291,9 +289,7 @@
user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the vent", "You hear loud scraping noises.")
welded = 0
update_icon()
var/image/I = image(src, loc, dir = dir)
I.plane = PLANE_UI_OBJECTS
pipe_vision_img = I
pipe_vision_img = image(src, loc, layer = 20, dir = dir)
playsound(loc, 'sound/weapons/bladeslice.ogg', 100, 1)
code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+2 -6
View File
@@ -308,9 +308,7 @@
user.visible_message("[user] unwelds the scrubber.", "You unweld the scrubber.", "You hear welding.")
welded = 0
update_icon()
var/image/I = image(src, loc, dir = dir)
I.plane = PLANE_UI_OBJECTS
pipe_vision_img = I
pipe_vision_img = image(src, loc, layer = 20, dir = dir)
return 0
else
return ..()
@@ -331,9 +329,7 @@
user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the scrubber.", "You hear loud scraping noises.")
welded = 0
update_icon()
var/image/I = image(src, loc, dir = dir)
I.plane = PLANE_UI_OBJECTS
pipe_vision_img = I
pipe_vision_img = image(src, loc, layer = 20, dir = dir)
playsound(loc, 'sound/weapons/bladeslice.ogg', 100, 1)
code/modules/clothing/clothing.dm
+1 -2
View File
@@ -355,10 +355,8 @@ BLIND // can't see anything
I.transform *= 0.5 //halve the size so it doesn't overpower the under
I.pixel_x += 8
I.pixel_y -= 8
var/oldlayer = I.layer
I.layer = FLOAT_LAYER
overlays += I
I.layer = oldlayer
if(istype(loc, /mob/living/carbon/human))
@@ -492,6 +490,7 @@ BLIND // can't see anything
hastie.transform *= 2
hastie.pixel_x -= 8
hastie.pixel_y += 8
hastie.layer = initial(hastie.layer)
overlays = null
usr.put_in_hands(hastie)
hastie = null
code/modules/events/anomaly_bluespace.dm
+1 -1
View File
@@ -65,7 +65,7 @@
blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH"
blueeffect.icon = 'icons/effects/effects.dmi'
blueeffect.icon_state = "shieldsparkles"
blueeffect.plane = PLANE_EFFECTS_UNLIT
blueeffect.layer = 17
blueeffect.mouse_opacity = 0
M.client.screen += blueeffect
sleep(20)
code/modules/flufftext/Hallucination.dm
+1 -1
View File
@@ -635,7 +635,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
if(!H.r_store) slots_free += ui_storage2
if(slots_free.len)
halitem.screen_loc = pick(slots_free)
halitem.plane = PLANE_UI_OBJECTS
halitem.layer = 50
switch(rand(1,6))
if(1) //revolver
halitem.icon = 'icons/obj/guns/projectile.dmi'
code/modules/lighting/lighting_system.dm
+3 -1
View File
@@ -27,6 +27,7 @@
*/
#define LIGHTING_CIRCULAR 1 //Comment this out to use old square lighting effects.
#define LIGHTING_LAYER 15 //Drawing layer for lighting
#define LIGHTING_CAP 10 //The lumcount level at which alpha is 0 and we're fully lit.
#define LIGHTING_CAP_FRAC (255/LIGHTING_CAP) //A precal'd variable we'll use in turf/redraw_lighting()
#define LIGHTING_ICON 'icons/effects/alphacolors.dmi'
@@ -235,7 +236,7 @@
/atom/movable/light
icon = LIGHTING_ICON
icon_state = LIGHTING_ICON_STATE
plane = PLANE_LIGHTING
layer = LIGHTING_LAYER
mouse_opacity = 0
blend_mode = BLEND_OVERLAY
invisibility = INVISIBILITY_LIGHTING
@@ -361,6 +362,7 @@
T.init_lighting()
T.update_lumcount(0)
#undef LIGHTING_LAYER
#undef LIGHTING_CIRCULAR
#undef LIGHTING_ICON
#undef LIGHTING_ICON_STATE
code/modules/mining/equipment_locker.dm
+3 -3
View File
@@ -253,6 +253,7 @@
new s.type(loc,s.max_amount)
s.use(s.max_amount)
s.loc = loc
s.layer = initial(s.layer)
/obj/machinery/mineral/ore_redemption/power_change()
..()
@@ -997,8 +998,7 @@
var/client/C = user.client
for(var/turf/closed/mineral/M in minerals)
var/turf/F = get_turf(M)
var/image/I = image('icons/turf/smoothrocks.dmi', loc = F, icon_state = M.scan_state)
I.plane = PLANE_EFFECTS_UNLIT
var/image/I = image('icons/turf/smoothrocks.dmi', loc = F, icon_state = M.scan_state, layer = 18)
C.images += I
spawn(30)
if(C)
@@ -1016,7 +1016,7 @@
C.icon_state = M.scan_state
/obj/effect/overlay/temp/mining_overlay
plane = PLANE_EFFECTS_UNLIT
layer = 20
icon = 'icons/turf/smoothrocks.dmi'
anchored = 1
mouse_opacity = 0
code/modules/mob/inventory.dm
+5
View File
@@ -29,6 +29,7 @@
if(!l_hand)
W.loc = src //TODO: move to equipped?
l_hand = W
W.layer = 20 //TODO: move to equipped?
W.equipped(src,slot_l_hand)
if(pulling == W)
stop_pulling()
@@ -46,6 +47,7 @@
if(!r_hand)
W.loc = src
r_hand = W
W.layer = 20
W.equipped(src,slot_r_hand)
if(pulling == W)
stop_pulling()
@@ -90,6 +92,7 @@
return 1
else
W.loc = get_turf(src)
W.layer = initial(W.layer)
W.dropped(src)
return 0
@@ -151,6 +154,8 @@
client.screen -= I
I.loc = loc
I.dropped(src)
if(I)
I.layer = initial(I.layer)
return 1
code/modules/mob/living/carbon/inventory.dm
+1
View File
@@ -32,6 +32,7 @@
I.screen_loc = null // will get moved if inventory is visible
I.loc = src
I.equipped(src, slot)
I.layer = 20
switch(slot)
if(slot_back)
code/modules/mob/living/living.dm
-1
View File
@@ -833,7 +833,6 @@ Sorry Giacom. Please don't be mad :(
I = image(r_hand.icon, A, r_hand.icon_state, A.layer + 1)
else // Attacked with a fist?
return
I.plane = PLANE_EFFECTS_UNLIT
// Who can see the attack?
var/list/viewing = list()
code/modules/mob/living/silicon/robot/inventory.dm
+3 -3
View File
@@ -48,7 +48,7 @@
if(!module_state_1)
O.mouse_opacity = initial(O.mouse_opacity)
module_state_1 = O
O.plane = PLANE_UI_OBJECTS
O.layer = 20
O.screen_loc = inv1.screen_loc
contents += O
if(istype(module_state_1,/obj/item/borg/sight))
@@ -58,7 +58,7 @@
else if(!module_state_2)
O.mouse_opacity = initial(O.mouse_opacity)
module_state_2 = O
O.plane = PLANE_UI_OBJECTS
O.layer = 20
O.screen_loc = inv2.screen_loc
contents += O
if(istype(module_state_2,/obj/item/borg/sight))
@@ -68,7 +68,7 @@
else if(!module_state_3)
O.mouse_opacity = initial(O.mouse_opacity)
module_state_3 = O
O.plane = PLANE_UI_OBJECTS
O.layer = 20
O.screen_loc = inv3.screen_loc
contents += O
if(istype(module_state_3,/obj/item/borg/sight))
code/modules/mob/living/silicon/robot/robot.dm
+1
View File
@@ -84,6 +84,7 @@
robot_modules_background = new()
robot_modules_background.icon_state = "block"
robot_modules_background.layer = 19 //Objects that appear on screen are on layer 20, UI should be just below it.
ident = rand(1, 999)
update_icons()
code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+1
View File
@@ -94,6 +94,7 @@
I.screen_loc = null // will get moved if inventory is visible
I.loc = src
I.equipped(src, slot)
I.layer = 20
switch(slot)
if(slot_head)
code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
+2
View File
@@ -37,6 +37,7 @@
hands_overlays += r_hand_image
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
r_hand.layer = 20
r_hand.screen_loc = ui_rhand
client.screen |= r_hand
@@ -53,6 +54,7 @@
hands_overlays += l_hand_image
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
l_hand.layer = 20
l_hand.screen_loc = ui_lhand
client.screen |= l_hand
code/modules/mob/living/ventcrawling.dm
+2 -2
View File
@@ -92,8 +92,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/components/unary
for(var/X in totalMembers)
var/obj/machinery/atmospherics/A = X //all elements in totalMembers are necessarily of this type.
if(!A.pipe_vision_img)
A.pipe_vision_img = image(A, A.loc, dir = A.dir)
A.pipe_vision_img.plane = PLANE_EFFECTS_UNLIT
A.pipe_vision_img = image(A, A.loc, layer = 20, dir = A.dir)
//20 for being above darkness
pipes_shown += A.pipe_vision_img
if(client)
client.images += A.pipe_vision_img
code/modules/mob/mob_grab.dm
+1 -1
View File
@@ -12,7 +12,7 @@
var/allow_upgrade = 1
var/last_upgrade = 0
plane = PLANE_UI_OBJECTS
layer = 21
item_state = "nothing"
w_class = 5
code/modules/mob/transform_procs.dm
+1
View File
@@ -132,6 +132,7 @@
if (W)
W.loc = loc
W.dropped(src)
W.layer = initial(W.layer)
//Make mob invisible and spawn animation
notransform = 1
code/modules/paperwork/photography.dm
+1 -1
View File
@@ -201,7 +201,7 @@
var/atom/c = atoms[i]
for(j = sorted.len, j > 0, --j)
var/atom/c2 = sorted[j]
if(c2.layer <= c.layer)//needs updating to account for plane
if(c2.layer <= c.layer)
break
sorted.Insert(j+1, c)
code/modules/power/singularity/collector.dm
+1
View File
@@ -118,6 +118,7 @@ var/global/list/rad_collectors = list()
if (!Z)
return
Z.loc = get_turf(src)
Z.layer = initial(Z.layer)
src.loaded_tank = null
if(active)
toggle_power()