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

Refresh: CLIP Part One: Outfits and Clothing #2783

Merged
merged 39 commits into from
Mar 9, 2024

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Feb 29, 2024

About The Pull Request

Screenshot_11203

No, she doesn't read your faxes.

Part 1. Adds clothing and outfits. Doesn't add the species variants as i just want to get this finished my god

Removes the asclepius and corvus. No hard feeling towards the asclepius, it would break with all the changes and so will the corvus. Except hard feelings towards corvus.

The guns will be in another PR pending a gun reorganization

Mass renames minutemen, cmm, to CLIP minutemen, CLIP, and similar

Something actually player facing: the camo fatigues and military webbings have been resprited

Why It's Good For The Game

image

image

Screenshot_11204

Changelog

🆑 ryerice, meemofcourse
add: redraws military webbing and camo fatigues, gives webbings recolor options
add: combat boots and gloves have been given happier colors

add: A ton of things related to the confederated league have been resprited and added
del: Corvus and Asclepius
tweak: CLIP ERTs have been adjusted to be consistent
/:cl:

@rye-rice rye-rice requested review from a team as code owners February 29, 2024 08:17
@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. TGUI Sound USSR Anthem 2.66 MB file. Code change Watch something violently break. labels Feb 29, 2024
code/datums/ert.dm Outdated Show resolved Hide resolved
code/modules/clothing/outfits/ert/minutemen_ert.dm Outdated Show resolved Hide resolved
code/modules/vending/wardrobes.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic/smg.dm Outdated Show resolved Hide resolved
rye-rice and others added 2 commits February 29, 2024 09:01
@Imaginos16 Imaginos16 changed the title refresh: clip part1: outfits and clothing Refresh: CLIP Part One: Outfits and Clothing Mar 4, 2024
Copy link
Contributor

github-actions bot commented Mar 4, 2024

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Mar 4, 2024
* you should merge this pr without looking

* tries to fix up the vela

kill people with a ship covered in moths that explodes and the moths go everywhere

* nooo mech techs!!

noooooooooooooo mech techs!!!!!
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Mar 4, 2024
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.

Sprites are good, good luck with everything else in the PR!

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Mar 6, 2024
Copy link
Contributor

github-actions bot commented Mar 6, 2024

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 Mar 7, 2024
@thgvr thgvr added this pull request to the merge queue Mar 9, 2024
Merged via the queue into shiptest-ss13:master with commit c0d7790 Mar 9, 2024
15 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Mar 9, 2024
![Screenshot_11203](https://github.com/shiptest-ss13/Shiptest/assets/58402542/e22d3bdc-acb4-488d-bf4c-74da9de8fe7c)

No, she doesn't read your faxes.

Part 1. Adds clothing and outfits. Doesn't add the species variants as i
just want to get this finished my god

Removes the asclepius and corvus. No hard feeling towards the asclepius,
it would break with all the changes and so will the corvus. Except hard
feelings towards corvus.

The guns will be in another PR pending a gun reorganization

Mass renames minutemen, cmm, to CLIP minutemen, CLIP, and similar

Something actually player facing: the camo fatigues and military
webbings have been resprited

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/8f4be9f3-2c75-411b-a30b-7709c751e655)

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/c330609c-a62e-4c27-a37f-7775ecaec526)

![Screenshot_11204](https://github.com/shiptest-ss13/Shiptest/assets/58402542/8d565b17-5de3-4812-a4a1-97dd1e1d6cbd)
:cl: ryerice, meemofcourse
add: redraws military webbing and camo fatigues, gives webbings recolor
options
add: combat boots and gloves have been given happier colors

add: A ton of things related to the confederated league have been
resprited and added
del: Corvus and Asclepius
tweak: CLIP ERTs have been adjusted to be consistent
/:cl:

---------

Signed-off-by: retlaw34 <[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. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes. TGUI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants