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 15:59:12 -04:00
committed by Atermonera
parent a2841ce9d6
commit 7d3aec96fd
118 changed files with 336 additions and 325 deletions
+4 -3
View File
@@ -10,7 +10,8 @@ LINEN BINS
icon = 'icons/obj/items.dmi'
icon_state = "sheet"
slot_flags = SLOT_BACK
layer = 4.0
plane = MOB_PLANE
layer = BELOW_MOB_LAYER
throwforce = 1
throw_speed = 1
throw_range = 2
@@ -19,9 +20,9 @@ LINEN BINS
/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
user.drop_item()
if(layer == initial(layer))
layer = MOB_LAYER + 0.1
layer = ABOVE_MOB_LAYER
else
layer = initial(layer)
reset_plane_and_layer()
add_fingerprint(user)
return
+1 -1
View File
@@ -2,7 +2,7 @@
icon_state = "girder"
anchored = 1
density = 1
layer = 2
plane = PLATING_PLANE
w_class = ITEMSIZE_HUGE
var/state = 0
var/health = 200
+1 -1
View File
@@ -8,7 +8,7 @@
throwpass = 1
climbable = 1
layer = 3.1 //Above dirt piles
layer = ABOVE_JUNK_LAYER
//Maybe make these calculate based on material?
var/health = 100
+1 -1
View File
@@ -7,7 +7,7 @@
anchored = 1
flags = CONDUCT
pressure_resistance = 5*ONE_ATMOSPHERE
layer = 2.9
layer = UNDER_JUNK_LAYER
explosion_resistance = 1
var/health = 10
var/destroyed = 0
+1 -1
View File
@@ -6,7 +6,7 @@
density = 0
anchored = 1.0
w_class = ITEMSIZE_NORMAL
layer = 2.3 //under pipes
plane = PLATING_PLANE
// flags = CONDUCT
/obj/structure/lattice/initialize()
+1 -1
View File
@@ -148,7 +148,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "morguet"
density = 1
layer = 2.0
plane = TURF_PLANE
var/obj/structure/morgue/connected = null
anchored = 1
throwpass = 1
+1 -1
View File
@@ -6,7 +6,7 @@
density = 1
throwpass = 1
climbable = 1
layer = 3.2 //Just above doors
layer = WINDOW_LAYER
anchored = 1
flags = ON_BORDER
icon_state = "railing0"
+2 -1
View File
@@ -172,7 +172,8 @@ obj/structure/safe/ex_act(severity)
icon_state = "floorsafe"
density = 0
level = 1 //underfloor
layer = 2.5
plane = TURF_PLANE
layer = ABOVE_UTILITY
/obj/structure/safe/floor/initialize()
. = ..()
+1 -1
View File
@@ -3,7 +3,7 @@
anchored = 1
opacity = 0
density = 0
layer = 3.5
layer = ABOVE_JUNK_LAYER
w_class = ITEMSIZE_NORMAL
/obj/structure/sign/ex_act(severity)
@@ -47,15 +47,17 @@
if(isnull(stool_cache[cache_key]))
var/image/I = image(icon, "[base_icon]_armrest")
I.layer = MOB_LAYER + 0.1
I.plane = MOB_PLANE
I.color = padding_material.icon_colour
stool_cache[cache_key] = I
overlays |= stool_cache[cache_key]
/obj/structure/bed/chair/proc/update_layer()
if(src.dir == NORTH)
src.layer = FLY_LAYER
plane = MOB_PLANE
layer = MOB_LAYER + 0.1
else
src.layer = OBJ_LAYER
reset_plane_and_layer()
/obj/structure/bed/chair/set_dir()
..()
+1 -1
View File
@@ -29,7 +29,7 @@
W.density = 1
user.remove_from_mob(W)
W.loc = loc
W.layer = 3.1
W.layer = ABOVE_JUNK_LAYER
pinned_target = W
user << "You slide the target into the stake."
return
@@ -7,7 +7,7 @@
icon = 'icons/obj/pipes/transit_tube.dmi'
icon_state = "E-W"
density = 1
layer = 3.1
layer = ABOVE_JUNK_LAYER
anchored = 1.0
var/list/tube_dirs = null
var/exit_delay = 2
+2 -2
View File
@@ -5,7 +5,7 @@
density = 1
w_class = ITEMSIZE_NORMAL
layer = 3.2//Just above doors
layer = WINDOW_LAYER
pressure_resistance = 4*ONE_ATMOSPHERE
anchored = 1.0
flags = ON_BORDER
@@ -462,7 +462,7 @@
if(ratio > 75)
return
var/image/I = image(icon, "damage[ratio]", layer + 0.1)
var/image/I = image(icon, "damage[ratio]", layer = layer + 0.1)
overlays += I
return