Arranges lots of things into planes (#5072)

* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
This commit is contained in:
Aronai Sieyes
2018-03-28 12:59:12 -07:00
committed by Atermonera
parent a2841ce9d6
commit 7d3aec96fd
118 changed files with 336 additions and 325 deletions
@@ -104,7 +104,6 @@
bmark.pixel_x = p_x
bmark.pixel_y = p_y
bmark.icon = 'icons/effects/effects.dmi'
bmark.layer = 3.5
bmark.icon_state = "scorch"
if(decaltype == 1)
@@ -46,7 +46,6 @@
name = "\proper the coordinates to clown planet"
icon_state = "data"
item_state = "card-id"
layer = 3
level = 2
desc = "This card contains coordinates to the fabled Clown Planet. Handle with care."
function = "teleporter"
@@ -30,7 +30,7 @@ var/list/tape_roll_applications = list()
name = "tape"
icon = 'icons/policetape.dmi'
anchored = 1
layer = 3.2
layer = WINDOW_LAYER
var/lifted = 0
var/crumpled = 0
var/tape_dir = 0
@@ -257,7 +257,7 @@ var/list/tape_roll_applications = list()
else
var/obj/item/tape/P = new tape_type(T)
P.update_icon()
P.layer = 3.2
P.layer = WINDOW_LAYER
user << "<span class='notice'>You finish placing \the [src].</span>"
if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor))
@@ -307,10 +307,11 @@ var/list/tape_roll_applications = list()
/obj/item/tape/proc/lift(time)
lifted = 1
layer = 8
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
spawn(time)
lifted = 0
layer = initial(layer)
reset_plane_and_layer()
// Returns a list of all tape objects connected to src, including itself.
/obj/item/tape/proc/gettapeline()
+1 -1
View File
@@ -131,7 +131,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "tape"
w_class = ITEMSIZE_TINY
layer = 4
plane = MOB_PLANE
anchored = 1 //it's sticky, no you cant move it
var/obj/item/weapon/stuck = null
+1 -1
View File
@@ -188,7 +188,7 @@
carrying.Add(I)
Img.icon = I.icon
Img.icon_state = I.icon_state
Img.layer = 30 + I.layer
Img.layer = layer + I.layer*0.01
if(istype(I, /obj/item/weapon/material))
var/obj/item/weapon/material/O = I
if(O.applies_material_colour)