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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ports hybrisa #310

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft

ports hybrisa #310

wants to merge 24 commits into from
+238,653 −22

Conversation

AndroBetel
Copy link
Contributor

much love to Zenith, cmss13-devs/cmss13#6248

@AndroBetel AndroBetel marked this pull request as draft July 4, 2024 20:09
@Doubleumc
Copy link
Contributor

Will require porting some changes from PvP's cmss13-devs/cmss13#5887 , namely from bed.dm:
https://github.com/cmss13-devs/cmss13/pull/5887/files#diff-3cb2797225c6412297f2e17bf6829a7092c684953a158480f8247a5dd9bcaae4

@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

Doubleumc
Doubleumc requested changes Aug 7, 2024
View reviewed changes
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

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

You'll want to update to the latest version of Hybrisa as well.

code/game/objects/structures/stool_bed_chair_nest/bed.dm Outdated Show resolved Hide resolved
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@github-actions github-actions bot added the Missing Changelog Maintainers always document their changes. label Sep 20, 2024
@cm13-github
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Doubleumc Doubleumc Doubleumc requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Mapping Merge Conflict Missing Changelog Maintainers always document their changes. Sound Sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AndroBetel @Doubleumc @cm13-github @harryob