diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 46abc0a67d7d..286fda25fbfe 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -415,7 +415,8 @@ //and now these defines /obj/structure/flora/rock - icon_state = "basalt" + icon_state = "basalt1" + base_icon_state = "basalt" desc = "A volcanic rock. Pioneers used to ride these babies for miles." icon = 'icons/obj/flora/rocks.dmi' resistance_flags = FIRE_PROOF @@ -450,7 +451,8 @@ playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE) /obj/structure/flora/rock/pile - icon_state = "lavarocks" + icon_state = "lavarocks1" + base_icon_state = "lavarocks" desc = "A pile of rocks." //Jungle grass @@ -472,14 +474,15 @@ //Jungle rocks /obj/structure/flora/rock/jungle - icon_state = "rock" + icon_state = "rock1" + base_icon_state = "rock" desc = "A pile of rocks." icon = 'icons/obj/flora/jungleflora.dmi' density = FALSE /obj/structure/flora/rock/jungle/Initialize() . = ..() - icon_state = "[initial(icon_state)][rand(1,5)]" + icon_state = "[base_icon_state][rand(1,5)]" //Jungle bushes @@ -489,9 +492,10 @@ desc = "A wild plant that is found in jungles." icon = 'icons/obj/flora/jungleflora.dmi' icon_state = "busha" + base_icon_state = "bush" /obj/structure/flora/junglebush/Initialize() - icon_state = "[icon_state][rand(1, 3)]" + icon_state = "[base_icon_state][rand(1, 3)]" . = ..() /obj/structure/flora/junglebush/b @@ -816,7 +820,8 @@ name = "lavatic rock" desc = "A volcanic rock. Lava is gushing from it. " icon = 'icons/obj/flora/lavarocks.dmi' - icon_state = "basalt" + icon_state = "basalt1" + base_icon_state = "basalt" light_color = "#ab4907" light_power = 3 light_range = 2 @@ -825,7 +830,8 @@ name = "rock shards" desc = "Jagged shards of volcanic rock protuding from the ground." icon = 'icons/obj/flora/lavarocks.dmi' - icon_state = "lavarocks" + icon_state = "lavarocks1" + base_icon_state = "lavarocks" gender = PLURAL /obj/structure/flora/rock/asteroid @@ -890,13 +896,15 @@ /obj/structure/flora/rock/hell name = "rock" desc = "A volcanic rock, one of the few familiar things on this planet." - icon_state = "basalt" + icon_state = "basalt1" + base_icon_state = "basalt" icon = 'icons/obj/flora/rocks.dmi' /obj/structure/flora/rock/beach name = "sea stack" desc = "A column of rock, formed by wave erosion." - icon_state = "basalt" + icon_state = "basalt1" + base_icon_state = "basalt" icon = 'icons/obj/flora/rocks.dmi' /obj/structure/flora/tree/dead/barren diff --git a/icons/obj/flora/ausflora.dmi b/icons/obj/flora/ausflora.dmi index c2440e27e17d..658d5ca9ecf8 100644 Binary files a/icons/obj/flora/ausflora.dmi and b/icons/obj/flora/ausflora.dmi differ diff --git a/icons/obj/flora/grass-sticks.dmi b/icons/obj/flora/grass-sticks.dmi index 055382b0fa89..5143807f53e7 100644 Binary files a/icons/obj/flora/grass-sticks.dmi and b/icons/obj/flora/grass-sticks.dmi differ diff --git a/icons/obj/flora/hellflora.dmi b/icons/obj/flora/hellflora.dmi index 403570c12486..299ded7c54c4 100644 Binary files a/icons/obj/flora/hellflora.dmi and b/icons/obj/flora/hellflora.dmi differ diff --git a/icons/obj/flora/jungleflora.dmi b/icons/obj/flora/jungleflora.dmi index 9a266e9226e8..bd4e169b1b4c 100644 Binary files a/icons/obj/flora/jungleflora.dmi and b/icons/obj/flora/jungleflora.dmi differ diff --git a/icons/obj/flora/lavarocks.dmi b/icons/obj/flora/lavarocks.dmi index f86be152a4c5..4211f3792210 100644 Binary files a/icons/obj/flora/lavarocks.dmi and b/icons/obj/flora/lavarocks.dmi differ diff --git a/icons/obj/flora/plants.dmi b/icons/obj/flora/plants.dmi index acd62631f941..4b62a74b0366 100644 Binary files a/icons/obj/flora/plants.dmi and b/icons/obj/flora/plants.dmi differ diff --git a/icons/obj/flora/rocks.dmi b/icons/obj/flora/rocks.dmi index d8cbec225115..197ee6e57053 100644 Binary files a/icons/obj/flora/rocks.dmi and b/icons/obj/flora/rocks.dmi differ diff --git a/icons/obj/flora/snowflora.dmi b/icons/obj/flora/snowflora.dmi index 11cbf5a5053f..002fd90c9fcd 100644 Binary files a/icons/obj/flora/snowflora.dmi and b/icons/obj/flora/snowflora.dmi differ diff --git a/icons/obj/flora/tall_trees_dead.dmi b/icons/obj/flora/tall_trees_dead.dmi index 93cd6f87e8d0..59dfbfb9003c 100644 Binary files a/icons/obj/flora/tall_trees_dead.dmi and b/icons/obj/flora/tall_trees_dead.dmi differ