Layers are now defines (#17949)

* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
This commit is contained in:
Joan Lung
2016-05-27 22:16:21 +02:00
committed by phil235
parent b61d1fd81f
commit 2cfb2d8eed
156 changed files with 296 additions and 280 deletions
@@ -5,7 +5,7 @@
desc = "It's green and acidic. It looks like... <i>blood?</i>"
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
@@ -3,7 +3,7 @@
desc = "It's red and gooey. Perhaps it's the chef's cooking?"
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/effects/blood.dmi'
icon_state = "floor1"
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
@@ -38,7 +38,7 @@
desc = "Your instincts say you shouldn't be following these."
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
random_icon_states = null
var/list/existing_dirs = list()
blood_DNA = list()
@@ -53,7 +53,7 @@
desc = "They look bloody and gruesome."
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/effects/blood.dmi'
icon_state = "gibbl5"
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
@@ -3,7 +3,7 @@
desc = "Someone should clean that up."
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/obj/objects.dmi'
icon_state = "shards"
@@ -26,7 +26,7 @@
icon_state = "dirt"
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
mouse_opacity = 0
/obj/effect/decal/cleanable/flour
@@ -34,7 +34,7 @@
desc = "It's still good. Four second rule!"
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon_state = "flour"
/obj/effect/decal/cleanable/greenglow
@@ -42,7 +42,7 @@
desc = "Jeez. I hope that's not for lunch."
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
luminosity = 1
icon_state = "greenglow"
@@ -53,7 +53,7 @@
name = "cobweb"
desc = "Somebody should remove that."
density = 0
layer = 3
layer = OBJ_LAYER
icon_state = "cobweb1"
burntime = 1
@@ -64,7 +64,7 @@
name = "gooey grey mass"
desc = "It looks like a melted... something."
density = 0
layer = 3
layer = OBJ_LAYER
icon = 'icons/obj/chemical.dmi'
icon_state = "molten"
@@ -72,7 +72,7 @@
name = "cobweb"
desc = "Somebody should remove that."
density = 0
layer = 3
layer = OBJ_LAYER
icon_state = "cobweb2"
//Vomit (sorry)
@@ -81,7 +81,7 @@
desc = "Gosh, how unpleasant."
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/effects/blood.dmi'
icon_state = "vomit_1"
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
@@ -113,14 +113,14 @@
name = "tomato smudge"
desc = "It's red."
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
/obj/effect/decal/cleanable/plant_smudge
name = "plant smudge"
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_plant")
@@ -128,7 +128,7 @@
name = "smashed egg"
desc = "Seems like this one won't hatch."
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
@@ -136,7 +136,7 @@
name = "smashed pie"
desc = "It's pie cream from a cream pie."
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_pie")
@@ -153,7 +153,7 @@
icon_state = "shreds"
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
/obj/effect/decal/cleanable/shreds/New()
pixel_x = rand(-5, 5)
@@ -5,7 +5,7 @@
desc = "It's a useless heap of junk... <i>or is it?</i>"
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/mob/robots.dmi'
icon_state = "gib1"
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
@@ -44,7 +44,7 @@
desc = "It's black and greasy. Looks like Beepsky made another mess."
gender = PLURAL
density = 0
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
icon = 'icons/mob/robots.dmi'
icon_state = "floor1"
var/viruses = list()
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "Graffiti. Damn kids."
icon = 'icons/effects/crayondecal.dmi'
icon_state = "rune1"
layer = 2.1
layer = ABOVE_NORMAL_TURF_LAYER
var/do_icon_rotate = TRUE
/obj/effect/decal/cleanable/crayon/examine()
@@ -31,7 +31,7 @@
/obj/effect/decal/cleanable/crayon/gang
layer = 3.6 //Harder to hide
layer = HIGH_OBJ_LAYER //Harder to hide
do_icon_rotate = FALSE //These are designed to always face south, so no rotation please.
var/datum/gang/gang
+3 -8
View File
@@ -2,7 +2,7 @@
name = "pointer"
icon = 'icons/mob/screen_gen.dmi'
icon_state = "arrow"
layer = 16
layer = POINT_LAYER
duration = 25
/obj/effect/overlay/temp/point/New(atom/target, set_invis = 0)
@@ -12,23 +12,18 @@
pixel_y = target.pixel_y
invisibility = set_invis
// Used for spray that you spray at walls, tables, hydrovats etc
/obj/effect/decal/spraystill
density = 0
layer = 50
//Used by spraybottles.
/obj/effect/decal/chempuff
name = "chemicals"
icon = 'icons/obj/chempuff.dmi'
pass_flags = PASSTABLE | PASSGRILLE
layer = 5
layer = FLY_LAYER
/obj/effect/decal/sandeffect
name = "sandy tile"
icon = 'icons/turf/floors.dmi'
icon_state = "sandeffect"
layer = 2
layer = ABOVE_OPEN_TURF_LAYER
/obj/effect/decal/fakelattice
name = "lattice"