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.

Sign up for GitHub

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

Jump to bottom

add bungalows 21 and 22 #64214

Merged
merged 7 commits into from
Mar 16, 2023
Merged

add bungalows 21 and 22 #64214

merged 7 commits into from
Mar 16, 2023

Conversation

LilShiningMan
Copy link
Contributor

Summary

Content "Add Bungalows 21 and 22"

Purpose of change

add house spawn variety

Describe the solution

Describe alternatives you've considered

Testing

linted and spawned in game

Additional

bungalow21 g
context
bungalow21 r
bungalow22 g
bungalow22 r

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Map / Mapgen Overmap, Mapgen, Map extras, Map display astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 13, 2023
LovamKicsiGazsii
LovamKicsiGazsii reviewed Mar 13, 2023
View reviewed changes
Copy link
Contributor

@LovamKicsiGazsii LovamKicsiGazsii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much to add aside from a few nitpicks:

data/json/mapgen/house/bungalow21.json Outdated Show resolved Hide resolved
data/json/mapgen/house/bungalow21.json Outdated Show resolved Hide resolved
data/json/mapgen/house/bungalow21.json Show resolved Hide resolved
data/json/mapgen/house/bungalow21.json Outdated Show resolved Hide resolved
@John-Candlebury
Copy link
Member

The bathroom in bungalow 21 probably deserves a window.

@LilShiningMan
Copy link
Contributor Author

window added

@LilShiningMan
Copy link
Contributor Author

I've also reverted the lab control for the bungalow21's garage back to the mechanical as it actually works.

@LovamKicsiGazsii
Copy link
Contributor

I've also reverted the lab control for the bungalow21's garage back to the mechanical as it actually works.

Gates have a random chance to fail, are you sure you're not mistaking it with that?

kép

Also, t_gates_mech_control doesn't even work with rock walls, so there's that.

@LilShiningMan
Copy link
Contributor Author

LilShiningMan commented Mar 16, 2023 •
edited
Loading

ok, you convinced me, changed back. It turned out I did just have bad luck and it didn't open when I tried it.

Last edit from me. This is good to go.

@dseguin dseguin merged commit a7dbd93 into CleverRaven:master Mar 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LovamKicsiGazsii LovamKicsiGazsii LovamKicsiGazsii left review comments

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@LilShiningMan @John-Candlebury @LovamKicsiGazsii @dseguin