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

Adds a crashed pubby as a sand world ruin #2363

Merged
merged 22 commits into from
Dec 16, 2023
Merged

Adds a crashed pubby as a sand world ruin #2363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5782cb5
Adds a crashed pubby as a sand world ruin
immortalartisan Sep 19, 2023
8f205be
I forgot to add a trailing line on the area file
immortalartisan Sep 19, 2023
c41680a
Removes a hermit in a wall
immortalartisan Sep 19, 2023
c521ff2
broken seed vendors causing conflicts
immortalartisan Sep 19, 2023
b2c5d1f
Requested changes made
immortalartisan Sep 19, 2023
d29e6c9
Merge branch 'master' into Pubby-ruin
immortalartisan Sep 20, 2023
f581935
Requested changes made
immortalartisan Sep 25, 2023
af7c79c
forgot to hit save on the map editor
immortalartisan Sep 25, 2023
5c7e0f3
Requested Changes Made
immortalartisan Sep 26, 2023
c2fad9f
adding a single scrap to re run tests
immortalartisan Sep 27, 2023
643f58a
moving piece of scrap around for test running
immortalartisan Sep 27, 2023
2a380c6
adding a single line to whitesands.dm to run tests
immortalartisan Sep 27, 2023
b3ec32a
Merge branch 'master' into Pubby-ruin
goober3 Sep 27, 2023
e5adb4e
Merge branch 'master' into Pubby-ruin
goober3 Sep 30, 2023
1cae64b
Merge branch 'master' into Pubby-ruin
spockye Oct 16, 2023
ceedefa
Merge branch 'master' into Pubby-ruin
spockye Oct 17, 2023
39852b7
Request changes once again made and ready to review
immortalartisan Oct 17, 2023
150882b
Merge branch 'Pubby-ruin' of https://github.com/immortalartisan/immor…
immortalartisan Oct 17, 2023
ab48a11
there were no remaining pod doors already
immortalartisan Oct 20, 2023
86d5400
Fixing conflict
immortalartisan Nov 10, 2023
3932ac3
Merge branch 'master' into Pubby-ruin
immortalartisan Nov 10, 2023
599832b
Merge branch 'master' into Pubby-ruin
goober3 Dec 16, 2023
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
Loading