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
+2 -1
View File
@@ -9,7 +9,8 @@
icon = 'icons/obj/machines/power/fusion.dmi'
icon_state = "emfield_s1"
alpha = 50
layer = 4
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
light_color = "#cc7700"
var/size = 1
@@ -2,7 +2,6 @@
name = "fuel rod assembly"
icon = 'icons/obj/machines/power/fusion.dmi'
icon_state = "fuel_assembly"
layer = 4
var/material_name
@@ -4,7 +4,6 @@
icon_state = "fuel_compressor1"
density = 1
anchored = 1
layer = 4
circuit = /obj/item/weapon/circuitboard/fusion_fuel_compressor
+6 -4
View File
@@ -16,7 +16,8 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "tube-construct-stage1"
anchored = 1
layer = 5
plane = MOB_LAYER
layer = ABOVE_MOB_LAYER
var/stage = 1
var/fixture_type = "tube"
var/sheets_refunded = 2
@@ -132,7 +133,8 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "bulb-construct-stage1"
anchored = 1
layer = 5
plane = MOB_LAYER
layer = ABOVE_MOB_LAYER
stage = 1
fixture_type = "bulb"
sheets_refunded = 1
@@ -143,7 +145,6 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "flamp-construct-stage1"
anchored = 0
layer = OBJ_LAYER
stage = 1
fixture_type = "flamp"
sheets_refunded = 2
@@ -156,7 +157,8 @@
icon_state = "tube1"
desc = "A lighting fixture."
anchored = 1
layer = 5 // They were appearing under mobs which is a little weird - Ostaf
plane = MOB_LAYER
layer = ABOVE_MOB_LAYER
use_power = 2
idle_power_usage = 2
active_power_usage = 20
@@ -12,7 +12,7 @@
desc = "Small machine which transmits data about specific powernet"
anchored = 1
density = 0
layer = 2.46 // Above cables, but should be below floors.
layer = ABOVE_UTILITY
icon = 'icons/obj/objects.dmi'
icon_state = "floor_beacon" // If anyone wants to make better sprite, feel free to do so without asking me.
@@ -7,7 +7,7 @@
icon_state = "singularity_s1"
anchored = 1
density = 1
layer = 6
plane = ABOVE_PLANE
light_range = 6
unacidable = 1 //Don't comment this out.
+2 -2
View File
@@ -8,10 +8,10 @@
icon_state = "term"
desc = "It's an underfloor wiring terminal for power equipment."
level = 1
layer = TURF_LAYER
var/obj/machinery/power/master = null
anchored = 1
layer = 2.6 // a bit above wires
plane = PLATING_PLANE
layer = WIRES_LAYER+0.01
/obj/machinery/power/terminal/New()