Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes rock sprites ingame [WHOOPS] #2332

Merged
merged 3 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions code/game/objects/structures/flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Binary file modified icons/obj/flora/ausflora.dmi
Binary file not shown.
Binary file modified icons/obj/flora/grass-sticks.dmi
Binary file not shown.
Binary file modified icons/obj/flora/hellflora.dmi
Binary file not shown.
Binary file modified icons/obj/flora/jungleflora.dmi
Binary file not shown.
Binary file modified icons/obj/flora/lavarocks.dmi
Binary file not shown.
Binary file modified icons/obj/flora/plants.dmi
Binary file not shown.
Binary file modified icons/obj/flora/rocks.dmi
Binary file not shown.
Binary file modified icons/obj/flora/snowflora.dmi
Binary file not shown.
Binary file modified icons/obj/flora/tall_trees_dead.dmi
Binary file not shown.