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

Cryopods #8727

Merged

Conversation

JamieD1
Copy link
Contributor

@JamieD1 JamieD1 commented May 27, 2020

Cryopods Port

Adds enterable machines which will despawn you after a few minutes, any important items which need to be in the game ie guns or hyposprays will be stored into the cryopod machine,

These can be retrieved with head or armoury access.

Added admincryo verb - can move people to cryo via right click

Sample Room:
Screenshot from Gyazo

Changelog

🆑
rscadd: Added Cryopods
/:cl:

@yogstation13-bot yogstation13-bot added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Icon Change labels May 27, 2020
@JamieD1 JamieD1 added the DO NOT MERGE Should not be merged without express approval from a Head Dev label May 27, 2020
@JamieD1
Copy link
Contributor Author

JamieD1 commented May 27, 2020

Runtimes, will fix when I get up, PRing now for feedback

@github-actions github-actions bot added the Sprites This PR has spriting changes label May 27, 2020
@Jumps0
Copy link
Contributor

Jumps0 commented May 27, 2020

Could you add some pictures?

@boodaliboo
Copy link
Contributor

add a changelog

@JamieD1 JamieD1 added TESTMERGE and removed DO NOT MERGE Should not be merged without express approval from a Head Dev labels May 28, 2020
@github-actions github-actions bot added the Admin This PR affects administrators label May 28, 2020
@JamieD1 JamieD1 requested review from alexkar598 and Hopekz May 28, 2020 20:55
@JamieD1 JamieD1 requested a review from Ktlwjec1 as a code owner May 29, 2020 15:02
@github-actions github-actions bot added the Mapping Will result in a change to a map. label May 29, 2020
@smorgli
Copy link
Contributor

smorgli commented May 29, 2020

vivaldi_ULRD1mBTup

vivaldi_X0BaYO0wBo

@JamieD1 JamieD1 requested review from alexkar598, Ktlwjec1 and Partheo and removed request for Partheo June 29, 2020 18:07
code/game/machinery/cryopod.dm Show resolved Hide resolved
Copy link
Contributor

@smorgli smorgli left a comment

Choose a reason for hiding this comment

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

Great PR really nice mapwork

@JamieD1 JamieD1 dismissed alexkar598’s stale review July 4, 2020 14:27

Because its done and merge time

@JamieD1
Copy link
Contributor Author

JamieD1 commented Jul 4, 2020

PREPARE FOR CONFLICTS

@JamieD1 JamieD1 merged commit 9cb0f08 into yogstation13:master Jul 4, 2020
Yogbot-13 added a commit that referenced this pull request Jul 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin This PR affects administrators Awaiting - Merge This PR is ready for merge 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.

None yet