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

Hardliner Rework Part 2: More Clothing and Roles! #3098

Merged
merged 28 commits into from
Jun 12, 2024

Conversation

Imaginos16
Copy link
Member

About The Pull Request

DAMN DANIEL... BACK AT IT AGAIN WITH THE Pull Requests‼️

This PR adds new outfits for our next Gorlex splinter group, the Hardliners!
image

This shit is straight up bussin', fr fr.

It also slightly remaps the Komodo to include new Hardliner content, for more awesome spacetok militia fancams.

Finally, this PR does some slight tweaks with a few outfits from NGR that turned out to be broken. UwUpsie...

Why It's Good For The Game

HEEEEEEEELP.mp4

Changelog

🆑 PositiveEntropy
add: The Hardliners have now made a proper appearance in the Frontier!
/:cl:

@Imaginos16 Imaginos16 requested review from a team as code owners June 11, 2024 07:09
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jun 11, 2024
@meemofcourse
Copy link
Contributor

we've got the torture labyrinth tomorrow

code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Apogee-dev Apogee-dev left a comment

Choose a reason for hiding this comment

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

Map changes look good, some change requests related to descriptions and outfit datums.

code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
code/modules/clothing/factions/hardliners.dm Outdated Show resolved Hide resolved
@Imaginos16 Imaginos16 dismissed Apogee-dev’s stale review June 12, 2024 04:41

Reviews and Concerns Adressed

@rye-rice rye-rice added this pull request to the merge queue Jun 12, 2024
Merged via the queue into shiptest-ss13:master with commit a3b847c Jun 12, 2024
14 checks passed
@Imaginos16 Imaginos16 deleted the hardliners branch June 12, 2024 06:08
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 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. -->

DAMN DANIEL... BACK AT IT AGAIN WITH THE `Pull Requests`:bangbang:

This PR adds new outfits for our next Gorlex splinter group, the
Hardliners!

![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/a9ffc60a-faeb-4e7c-9fc0-39ebb6280083)

This shit is straight up bussin', fr fr.

It also slightly remaps the Komodo to include new Hardliner content, for
more awesome spacetok militia fancams.

Finally, this PR does some slight tweaks with a few outfits from NGR
that turned out to be broken. UwUpsie...
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

https://github.com/shiptest-ss13/Shiptest/assets/77556824/656c82d3-c7ec-4bdd-9846-564c1186fcbf

<!-- 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: PositiveEntropy
add: The Hardliners have now made a proper appearance in the Frontier!
/: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: Imaginos16 <[email protected]>
Co-authored-by: FalloutFalcon <[email protected]>
Co-authored-by: thgvr <[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.

6 participants