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

Admin Flag for Disposal mobs #3814

Merged
merged 8 commits into from
Aug 4, 2023

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Jul 5, 2023

About the pull request

Allows admins to toggle a flag as to whether mobs will fit inside disposals tubes.

Explain why it's good for the game

Regarding disposal tubes, there are some situations where I can see it being fitting to the situation, and this will also allow a measured level of return for a feature we had to remove due to abuse.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added an admin toggle flag for fitting mobs into disposals. (Within reason - no queens...)
add: The Crawler trait that allows mobs to enter vents will also allow them to climb into disposals regardless of above flag.
add: Added a subtype of disposal that can't fit mobs, used for the delivery units.
/:cl:

@github-actions github-actions bot added Mapping did you remember to save in tgm format? Feature Feature coder badge labels Jul 5, 2023
Makes sense to let the crawler trait bypass it, if it can let you crawl in vents.
@realforest2001 realforest2001 changed the title Disposable Mobs Flag Admin Flags for Disposals and Nests Jul 8, 2023
@K4rlox K4rlox mentioned this pull request Jul 9, 2023
3 tasks
@realforest2001 realforest2001 changed the title Admin Flags for Disposals and Nests Admin Flag for Disposal mobs Jul 10, 2023
@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 18, 2023
@Nanu308 Nanu308 added Mapping Approved adds 500 new dict keys and removed Stale beg a maintainer to review your PR labels Jul 19, 2023
code/modules/recycling/disposal.dm Outdated Show resolved Hide resolved
code/modules/recycling/disposal.dm Outdated Show resolved Hide resolved
code/modules/recycling/disposal.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft July 19, 2023 11:58
@realforest2001 realforest2001 marked this pull request as ready for review July 19, 2023 13:14
code/modules/recycling/disposal.dm Show resolved Hide resolved
code/modules/recycling/disposal.dm Outdated Show resolved Hide resolved
code/modules/recycling/disposal.dm Outdated Show resolved Hide resolved
@Zonespace27 Zonespace27 marked this pull request as draft July 22, 2023 13:49
@cm13-github
Copy link
Contributor

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

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

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 31, 2023
@realforest2001 realforest2001 marked this pull request as ready for review July 31, 2023 12:12
@harryob harryob added this pull request to the merge queue Aug 4, 2023
Merged via the queue into cmss13-devs:master with commit 34f1f24 Aug 4, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Aug 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants