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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Admin] Non Lethal Smiting #8540

Merged
merged 2 commits into from May 23, 2020
Merged

[Admin] Non Lethal Smiting #8540

merged 2 commits into from May 23, 2020

Conversation

JamieD1
Copy link
Contributor

@JamieD1 JamieD1 commented May 16, 2020

Pies

Changelog

馃啈
rscadd: Pies
/:cl:

@yogstation13-bot yogstation13-bot added the Feature This adds new content to the game label May 16, 2020
@swissloaf swissloaf added Admin This PR affects administrators Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer Literally the best PR My god its beautiful labels May 16, 2020
@MegaEmpirical
Copy link

Now make it explode!

@ToGWtF
Copy link
Contributor

ToGWtF commented May 17, 2020

speedmerge

Hopekz
Hopekz suggested changes May 21, 2020
View reviewed changes
Copy link
Contributor

@Hopekz Hopekz left a comment

Choose a reason for hiding this comment

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

Otherwise ready for merge

code/modules/admin/verbs/randomverbs.dm Outdated Show resolved Hide resolved
@alexkar598 alexkar598 added Awaiting - Action - Author This PR is awaiting an action from the author and removed Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer labels May 21, 2020
@JamieD1 JamieD1 requested a review from Hopekz May 21, 2020 22:43
@JamieD1
Copy link
Contributor Author

JamieD1 commented May 21, 2020

Hows that

@Hopekz Hopekz merged commit 0eddd64 into yogstation13:master May 23, 2020
yogstation13-bot added a commit that referenced this pull request May 23, 2020
@yogstation13-bot
Automatic changelog generation #8540 [ci skip]
4eba969
@JamieD1 JamieD1 deleted the AdminPie branch June 4, 2020 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hopekz Hopekz Hopekz approved these changes

Assignees
No one assigned
Labels
Admin This PR affects administrators Awaiting - Action - Author This PR is awaiting an action from the author Feature This adds new content to the game Literally the best PR My god its beautiful
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@JamieD1 @MegaEmpirical @ToGWtF @Hopekz @yogstation13-bot @alexkar598 @swissloaf