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.

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

Tent code changes #4796

Merged
merged 6 commits into from
Nov 6, 2023
Merged

Tent code changes #4796

merged 6 commits into from
Nov 6, 2023

Conversation

BeagleGaming1
Copy link
Contributor

About the pull request

Using the tents map template datum directly makes it easier to edit

Explain why it's good for the game

Makes it possible to vv edit it

Changelog

🆑
code: Tents now hold the datum directly, instead of the typepath
admin: Added a proc for staff to change tent dmm's
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Code Improvement Make the code longer Admin Make things harder for admins labels Oct 28, 2023
Copy link
Member

@fira fira left a comment

Choose a reason for hiding this comment

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

Looks good to me

@BeagleGaming1 BeagleGaming1 marked this pull request as draft October 28, 2023 18:31
@BeagleGaming1 BeagleGaming1 marked this pull request as ready for review October 29, 2023 16:34
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 30, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 31, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@harryob harryob added this pull request to the merge queue Nov 6, 2023
Merged via the queue into cmss13-devs:master with commit 8cc8778 Nov 6, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Make things harder for admins Code Improvement Make the code longer Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants