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

Minutemanning #2455

Closed
wants to merge 3 commits into from
Closed

Minutemanning #2455

wants to merge 3 commits into from

Conversation

Erikafox
Copy link
Contributor

@Erikafox Erikafox commented Nov 6, 2023

About The Pull Request

#2221 but for minutemen

Why It's Good For The Game

IFF (2030)

Changelog

🆑
code: All minutemen outfits have been repathed, please report any odd happenings to your local coders
/:cl:

@Erikafox Erikafox requested a review from a team as a code owner November 6, 2023 15:53
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Code change Watch something violently break. Merge Conflict Use Git Hooks, you're welcome. labels Nov 6, 2023
Copy link
Contributor

github-actions bot commented Nov 8, 2023

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 15, 2023
@@ -132,7 +132,7 @@
item_state = "securitypack"

/obj/item/storage/backpack/security/cmm
name = "cmm backpack"
name = "CMM backpack"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
name = "CMM backpack"
name = "\improper CMM backpack"

@@ -286,7 +286,7 @@
item_state = "satchel-sec"

/obj/item/storage/backpack/satchel/sec/cmm
name = "cmm satchel"
name = "CMM satchel"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
name = "CMM satchel"
name = "\improper CMM satchel"

@Erikafox Erikafox closed this Nov 19, 2023
github-merge-queue bot pushed a commit that referenced this pull request Jan 17, 2024
…SecHud Icons (#2628)

<!-- 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. -->

## About The Pull Request
This pull request does the following:
* Revives #2455 and
#2493
* Sorts every factional outfit into a base outfit. These base outfits
apply a faction.
* Puts factional outfits into their own files.
* Adds (partial) factional backgrounds for sechud icons.

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/07f7b83b-14bb-4cbf-a250-4dd16208da02)

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/b32620e5-d0fe-4b59-b013-d30211f2f2aa)
* Adds a new Frontiersmen ERT. The gimmick is that their equipment is
randomized, for the true "when the first is killed, the second takes the
rifle" experience. You could get a mounted machine gun. Or a flyswatter.

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/f5f058f1-4bdf-4abd-8bef-ff6158bdfb41)
* Makes Agent Cards work with SecHuds, and get overlays when using the
Select Chameleon Outfit button.
* Fixes the chameleon mask and goggles default icon states.

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

## Why It's Good For The Game
Easier to sift through. IFF (2234). Support for custom SecHud icons.
Actually looks pretty on the outfit manager. Sugarcube Frontiersmen
Rogue-like 2024. Identity Threat+.

<!-- 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. -->

## Changelog

:cl: MeeMOfCourse, retlaw34
tweak: Repathed almost every faction outfit, and they now apply factions
upon being used.
tweak: SecHud icons have been redone. Sprites by retlaw34.
tweak: Descriptions of multiple clothing items.
add: SecHuds now identify factions. Somewhat.
add: More desperate groups of Frontiersmen have been spotted roaming 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: meem <[email protected]>
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jan 27, 2024
…SecHud Icons (shiptest-ss13#2628)

<!-- 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. -->
This pull request does the following:
* Revives shiptest-ss13#2455 and
shiptest-ss13#2493
* Sorts every factional outfit into a base outfit. These base outfits
apply a faction.
* Puts factional outfits into their own files.
* Adds (partial) factional backgrounds for sechud icons.

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/07f7b83b-14bb-4cbf-a250-4dd16208da02)

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/b32620e5-d0fe-4b59-b013-d30211f2f2aa)
* Adds a new Frontiersmen ERT. The gimmick is that their equipment is
randomized, for the true "when the first is killed, the second takes the
rifle" experience. You could get a mounted machine gun. Or a flyswatter.

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/f5f058f1-4bdf-4abd-8bef-ff6158bdfb41)
* Makes Agent Cards work with SecHuds, and get overlays when using the
Select Chameleon Outfit button.
* Fixes the chameleon mask and goggles default icon states.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Easier to sift through. IFF (2234). Support for custom SecHud icons.
Actually looks pretty on the outfit manager. Sugarcube Frontiersmen
Rogue-like 2024. Identity Threat+.

<!-- 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: MeeMOfCourse, retlaw34
tweak: Repathed almost every faction outfit, and they now apply factions
upon being used.
tweak: SecHud icons have been redone. Sprites by retlaw34.
tweak: Descriptions of multiple clothing items.
add: SecHuds now identify factions. Somewhat.
add: More desperate groups of Frontiersmen have been spotted roaming 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: 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants