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

SUNS Part One: Clothing #2685

Merged
merged 22 commits into from
Feb 5, 2024

Conversation

Skies-Of-Blue
Copy link
Contributor

@Skies-Of-Blue Skies-Of-Blue commented Jan 30, 2024

About The Pull Request

Picks up where the brave Draggeru left off, giving her sprites a second chance at life!

More information can be found in the original PR #2439

Why It's Good For The Game

I want my pompous bastards and I want them NOW

278865636-bde939c3-534a-4d05-b0a0-a782d611d4dd

Note: The majority of these items are still unimplemented, although some can now be found on the Aegis. The primary goal of this PR is to give future SUNS ships something to work with (and maybe allow for some cheeky events in the meantime)

Changelog

🆑 Draggeru, Cre
add: adds all of the clothing intended for SUNS, including uniforms for the captain, xo, cmo, scientists, miners, engineers, and doctors
add: several job outfits to support future SUNS content
/:cl:

@Skies-Of-Blue Skies-Of-Blue requested a review from a team as a code owner January 30, 2024 05:35
@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jan 30, 2024
Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

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

fucking BLESS YOU

maybe ask @meemofcourse for help with outfits? or is that out of scope

Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

these are nice. if you want help with the outfits you can ping me on discord

code/modules/clothing/glasses/hud.dm Outdated Show resolved Hide resolved
code/modules/clothing/glasses/_glasses.dm Outdated Show resolved Hide resolved
code/modules/clothing/masks/breath.dm Outdated Show resolved Hide resolved
code/modules/clothing/masks/miscellaneous.dm Outdated Show resolved Hide resolved
Copy link
Member

@thgvr thgvr left a comment

Choose a reason for hiding this comment

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

These need to be sorted into factional files.
You can see an example of how this should be done with the Gezenan assets.
icons/mob/clothing/faction/...
icons/obj/clothing/faction/...
code/modules/clothing/faction/...

Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

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

all seems well! you forgot to draft for the outfits though

@rye-rice rye-rice marked this pull request as draft January 30, 2024 22:01
@lectronyx
Copy link

lectronyx commented Jan 31, 2024

I see that Jotaro hat.
Jokes aside, these look dope as hell.

@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Feb 2, 2024
@Skies-Of-Blue Skies-Of-Blue marked this pull request as ready for review February 2, 2024 05:00
@Skies-Of-Blue Skies-Of-Blue requested a review from a team as a code owner February 2, 2024 05:00
@Skies-Of-Blue Skies-Of-Blue requested a review from thgvr February 2, 2024 05:14
@Skies-Of-Blue
Copy link
Contributor Author

PR ready for re-review!

Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

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

yep once again

Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

yup

@thgvr
Copy link
Member

thgvr commented Feb 2, 2024

Will thorougly go over this later today, if I don't shake me violently

Copy link
Member

@Imaginos16 Imaginos16 left a comment

Choose a reason for hiding this comment

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

I'm gonna Drag a certain someone back to this server mark my words

@rye-rice
Copy link
Member

rye-rice commented Feb 3, 2024

heh. heh heh.
in all honesty, this SHOULD be ready to merge, as theres nothing really player facing atm

@meemofcourse
Copy link
Contributor

wrong, aegis outfits

@rye-rice
Copy link
Member

rye-rice commented Feb 3, 2024

oh right

Copy link
Member

@thgvr thgvr left a comment

Choose a reason for hiding this comment

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

Nitpicks to make everyone's life easier down the line

code/modules/clothing/factions/suns.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/suns.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/suns.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/suns.dm Show resolved Hide resolved
code/modules/clothing/factions/suns.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/suns.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/suns.dm Outdated Show resolved Hide resolved
code/modules/clothing/spacesuits/hardsuit.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/accessories.dm Outdated Show resolved Hide resolved
@Skies-Of-Blue Skies-Of-Blue requested a review from thgvr February 4, 2024 23:22
@thgvr thgvr enabled auto-merge February 5, 2024 00:44
@thgvr thgvr added this pull request to the merge queue Feb 5, 2024
Merged via the queue into shiptest-ss13:master with commit f86fe86 Feb 5, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 7, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
Picks up where the brave Draggeru left off, giving her sprites a second
chance at life!

More information can be found in the original PR
shiptest-ss13#2439

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
I want my pompous bastards and I want them NOW

![278865636-bde939c3-534a-4d05-b0a0-a782d611d4dd](https://github.com/shiptest-ss13/Shiptest/assets/86762641/c1dc3f65-5896-41ca-a475-aa0028aea1c4)

Note: The majority of these items are still unimplemented, although some
can now be found on the Aegis. The primary goal of this PR is to give
future SUNS ships something to work with (and maybe allow for some
cheeky events in the meantime)

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: Draggeru, Cre
add: adds all of the clothing intended for SUNS, including uniforms for
the captain, xo, cmo, scientists, miners, engineers, and doctors
add: several job outfits to support future SUNS content
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Skies-Of-Blue <[email protected]>
Co-authored-by: meem <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants