diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index d81af121c14..8bf04d32eea 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -239,38 +239,23 @@ //a rock is flora according to where the icon file is //and now these defines + /obj/structure/flora/rock - name = "rock" - desc = "a rock" - icon_state = "rock" + icon_state = "basalt" + desc = "A volcanic rock" icon = 'icons/obj/flora/rocks.dmi' anchored = 1 burn_state = FIRE_PROOF density = 1 /obj/structure/flora/rock/New() - ..() - icon_state = "[icon_state][rand(1,5)]" - -/obj/structure/flora/rock/pile - name = "rocks" - desc = "some rocks" - icon_state = "rockpile" - density = 0 - - -/obj/structure/flora/rock/volcanic - icon_state = "basalt" - desc = "A volcanic rock" - - -/obj/structure/flora/rock/volcanic/New() ..() icon_state = "[icon_state][rand(1,3)]" -/obj/structure/flora/rock/pile/volcanic +/obj/structure/flora/rock/pile icon_state = "lavarocks" + desc = "A pile of rocks" -/obj/structure/flora/rock/pile/volcanic/New() +/obj/structure/flora/rock/pile/New() ..() icon_state = "[icon_state][rand(1,3)]" \ No newline at end of file diff --git a/icons/obj/flora/rocks.dmi b/icons/obj/flora/rocks.dmi index 6708d199b14..f2d49ec016e 100644 Binary files a/icons/obj/flora/rocks.dmi and b/icons/obj/flora/rocks.dmi differ