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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(port): Fix farm greenhouse floors. Add metal floors to grain bins. #4056

Merged
merged 4 commits into from
Jan 5, 2024
Merged

Conversation

0Monet
Copy link
Contributor

@0Monet 0Monet commented Jan 5, 2024

Purpose of change

Use "t_dirtfloor" under the display racks in "ranch_camp_57".
Put metal floor on level 0 of the farm and ranch silos, as this makes sense since the other silos use metal floor.
Use "t_open_air_rooved" inside the ranch silo.
Fix the greenhouse floor in the farm by using "t_dirtfloor" under the planters.

Describe the solution

JSON changes.
Port CleverRaven/Cataclysm-DDA#56124

Describe alternatives you've considered

Do nothing.

Testing

  1. I go to the farm and ranch.
  2. No problems.

Additional context

Before:
"ranch_camp_57":
image1
"farm_1":
image2
After:
image3
image4

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Jan 5, 2024
Copy link
Contributor

autofix-ci bot commented Jan 5, 2024

The Autofix app has found code style violation and automatically formatted this Pull Request.

I locally edit my commits (e.g: git, github desktop)

Please choose following options:

I'd like to accept the automated commit
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

This PR is complete and I don't want to edit it anymore

It's safe to ignore this message.

I edit this PR through web UI

You can ignore this message and continue working.

I have no idea what this message is talking about

You can ignore this message and continue working. If you find any problem, please ask for help and ping @scarf005.

@chaosvolt chaosvolt merged commit 12ab4b2 into cataclysmbnteam:main Jan 5, 2024
9 checks passed
@0Monet 0Monet deleted the fix_floor branch January 5, 2024 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants