Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@MajManatee
Copy link
Contributor

Document the changes in your pull request

Adds a book to xenobio, PLEASE NO MORE MERGE CONFLICTS!!

Changelog

🆑
rscadd: Adds a book to xenobio
/:cl:

@MajManatee MajManatee requested review from a team as code owners April 23, 2022 22:43
@Yogbot-13 Yogbot-13 added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Mapping Will result in a change to a map. Sprites This PR has spriting changes labels Apr 23, 2022
@ghost
Copy link

ghost commented Apr 24, 2022

Sus

@MajManatee
Copy link
Contributor Author

not my fault jamie kept changing the map. it IS my fault that I don't know how to fix a merge conflict normally

@JamieD1 JamieD1 merged commit 7e556a2 into yogstation13:master Apr 24, 2022
Yogbot-13 added a commit that referenced this pull request Apr 24, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Mapping Will result in a change to a map. Sprites This PR has spriting changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants