Skip to content
This repository has been archived by the owner on Sep 12, 2021. It is now read-only.

Porting my ruins #224

Merged
merged 14 commits into from Jun 3, 2020
Merged

Porting my ruins #224

merged 14 commits into from Jun 3, 2020

Conversation

Vorak2
Copy link
Contributor

@Vorak2 Vorak2 commented May 17, 2020

About The Pull Request

ports most of the ruins I made on bee with some small fixes like removing the alien aloy golem att the entrance of the power puzzle. should be working now.
power_puzzle
macspace
Asteroid

Why It's Good For The Game

More ruins more fun and I am 90% shure they are working

Changelog

馃啈
add: A fast food restaurant has gone dark in your area the last message from the establishment said something about plushies
add: A secure storage site that has been depowerd and abandoned for years has floated into your area it is said to contain some rare items
add: an asteroid mining operation in your area has gone dark after reports of monsters being active in the area bee on the lookout for it as the last report stated they had a considerable amount of ores in the base

/:cl:

@Vorak2
Copy link
Contributor Author

Vorak2 commented May 17, 2020

Not 100 on if my modularisation of the areas worked but as I said I cant test it fully so input on that is needed

removed the old wires from the power puzzle as I think they would cause problems if they stayed with redstone around. think I caught them all
becouse I am stupid
Copy link
Contributor

@SynnGraffkin SynnGraffkin left a comment

Choose a reason for hiding this comment

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

Your areas should probably be under waspstation/code/game/area/areas/ruins/space.dm so it can be similar to match the code folder.

image

@Vorak2
Copy link
Contributor Author

Vorak2 commented May 27, 2020

Your areas should probably be under waspstation/code/game/area/areas/ruins/space.dm so it can be similar to match the code folder.

image

Gitkraken is not coperating with me so I cant fix this as of now. might se if I can get things working on another computer but that might take time.

@Vorak2 Vorak2 closed this May 27, 2020
@Vorak2 Vorak2 reopened this May 27, 2020
@Vorak2
Copy link
Contributor Author

Vorak2 commented May 27, 2020

The reson I did not do the entire Ladder of folders as I didnt think we will need the entire ladder due to uss probably not going to need that manny new areas

@SynnGraffkin
Copy link
Contributor

It's easier to just do the entire ladder since this is expanding upon the existing space ruins areas.

@SynnGraffkin
Copy link
Contributor

This just makes me irritated.

image

Also @MarkSuckerberg , Linter machine broke.

@Vorak2
Copy link
Contributor Author

Vorak2 commented May 27, 2020

I do think that was the correct thing for file pathing to ruin maps. Though I agree it is somewhat irritating and probably unnecessary as these are new maps and if there is a change it wont matter if they are modularised.

@Superyodeler
Copy link
Contributor

I got the same linter error in my pr.

@Maldaris
Copy link
Contributor

So there's this issue upstream with babel, looks like there's something funky going on with the cache/CRAs for this particular package. The strategy would be to npm update inside the JS directory, rm -rf ./node_modules then run npm install again.

If need be I can get this in as a separate PR, @MarkSuckerberg

@Maldaris
Copy link
Contributor

Fix for build issue is in #237

Copy link
Contributor

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

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

Rebase this branch onto the latest master branch, or merge the master branch into this branch. Basically just get it to pass the linter and I'll merge it

@MarkSuckerberg MarkSuckerberg merged commit 039f984 into Whitesands13:master Jun 3, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants