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

Moving Chickenbot, Tankbot, and Tripod to Aftershock #36447

Merged
merged 6 commits into from
Dec 30, 2019
Merged

Moving Chickenbot, Tankbot, and Tripod to Aftershock #36447

merged 6 commits into from
Dec 30, 2019

Conversation

Maleclypse
Copy link
Member

Summary

SUMMARY: Mods "Moving obsoleted scifi bots to Aftershock"

Purpose of change

Content cut from mainline for being too sci-fi. It is in fact sci-fi enough for Aftershock.

Describe the solution

I've moved it over will need to create new locations that use them.

Describe alternatives you've considered

None

Testing

TBD

Additional context

@Maleclypse
Moving CleverRaven#36438 to Aftershock
6d3ae1a 
I moved the parts I understood and didn't move the specific mapgens.  Will likely create own lab finales eventually.
@Maleclypse
Update afs_weapons.json
7193ff1
@YukariMindGap
Copy link
Contributor

It's conflicting, yo

@Maleclypse
Copy link
Member Author

Maleclypse commented Dec 28, 2019 •
edited
Loading

Would you like to commit some suggestion in where to fix the conflicts?

Edit: totally misread you this morning. Yeah, I need to resolve those. I think there will still be errors after I fix the conflicts.

@Maleclypse Maleclypse changed the title WIP Moving Chickenbot, Tankbot, and Tripod to Aftershock Moving Chickenbot, Tankbot, and Tripod to Aftershock Dec 29, 2019
@weekly-digest weekly-digest bot mentioned this pull request Dec 29, 2019
Closed
@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Monsters Monsters both friendly and unfriendly. labels Dec 30, 2019
@Rivet-the-Zombie Rivet-the-Zombie merged commit 976c1d9 into CleverRaven:master Dec 30, 2019
This was referenced Jan 5, 2020
Closed
Closed
@John-Candlebury John-Candlebury added the Mods: Aftershock Anything to do with the Aftershock mod label Jan 8, 2020
@Maleclypse Maleclypse deleted the Chicken-tripod-tankbot-to-aftershock branch April 13, 2020 16:13
@Night-Pryanik Night-Pryanik mentioned this pull request Sep 25, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [JSON] Changes (can be) made in JSON Mods: Aftershock Anything to do with the Aftershock mod Monsters Monsters both friendly and unfriendly.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Maleclypse @YukariMindGap @Rivet-the-Zombie @John-Candlebury @ZhilkinSerg