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

Makes the predator computers not a moneybag subtype #4084

Merged
merged 2 commits into from
Aug 3, 2023

Conversation

Zonespace27
Copy link
Contributor

@Zonespace27 Zonespace27 commented Aug 2, 2023

About the pull request

Makes predator computers their own prop instead of being a subtype of /obj/item/moneybag for some reason??? Also makes them dense while I'm there.

Explain why it's good for the game

To quote a mapping friend of mine,

image

Changelog

🆑
fix: Predator flight computers can no longer be walked on.
/:cl:

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

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

@github-actions github-actions bot added Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more labels Aug 2, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 2, 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 Aug 3, 2023
Merged via the queue into cmss13-devs:master with commit e513b8a Aug 3, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants