Skip to content

Commit

Permalink
Fixes rock sprites ingame [WHOOPS] (shiptest-ss13#2332)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Rocks were invisible in game due to a recently merged PR of mine. this
is why we testmerge PRs! anyways this should fix them.

Adds flora and rock missing texture sprites to most flora files to
prevent something like this from ever happening again.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
invisible things that block movement bad yeah. i want to fix my
mistakes.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: Most rocks are now visible again
add: Most flora files now have missing texture sprites to make it easier
to spot when something has gone wrong.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Zevotech authored Sep 5, 2023
1 parent f23823e commit b22529f
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 9 deletions.
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.

0 comments on commit b22529f

Please sign in to comment.