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

Already on GitHub? Sign in to your account

Adds in hoods + OWLF placeholder items #2877

Merged
merged 9 commits into from Mar 31, 2023

Conversation

NewyearnewmeUwu
Copy link
Contributor

About the pull request

This adds in a new system for 'hoods' or integrated helmets akin to normal SS13's voidsuits. None of this has stats apart from the uniform, and this is meant to be a foundation for properly implementing OWLF in the future, as a possible replacement pred hunting ERT for DD.

Explain why it's good for the game

It's cool, the code works, and this is soulful.

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 OWLF placeholder items, none of which are properly statted yet.
code: CM's code now has support for integrated hoods for uniforms.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Code Improvement Make the code longer labels Mar 18, 2023
code/modules/clothing/under/under.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/under.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/under.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/under.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft March 18, 2023 19:50
@NewyearnewmeUwu NewyearnewmeUwu marked this pull request as ready for review March 18, 2023 20:44
@Agameofscones
Copy link
Contributor

oh god oh fuck I should probably finish the OWLF gun sprites soon

code/modules/clothing/under/under.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/under.dm Outdated Show resolved Hide resolved
@NewyearnewmeUwu NewyearnewmeUwu requested review from a team as code owners March 19, 2023 16:21
@morrowwolf morrowwolf added the Roadmap "I think you're holding it upside down" label Mar 19, 2023
@github-actions github-actions bot added the Merge Conflict PR can't be merged because it touched too much code label Mar 21, 2023
@github-actions github-actions bot removed the Merge Conflict PR can't be merged because it touched too much code label Mar 21, 2023
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

code

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

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

sprites look good to me! approved

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Mar 31, 2023
@harryob harryob added this pull request to the merge queue Mar 31, 2023
Merged via the queue into cmss13-devs:master with commit 70c3e3b Mar 31, 2023
22 checks passed
github-actions bot added a commit that referenced this pull request Mar 31, 2023
cm13-github added a commit that referenced this pull request Mar 31, 2023
@NewyearnewmeUwu NewyearnewmeUwu deleted the owlfsprites branch April 9, 2023 21:16
@cm13live
Copy link

This pull request has been mentioned on CM-SS13. Please provide feedback here:

https://forum.cm-ss13.com/t/dutch-ert-suggestion/1403/3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge Roadmap "I think you're holding it upside down" Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants