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.

Sign up for GitHub

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

Jump to bottom

Port Frontier Clothes #1388

Merged
merged 6 commits into from
Jan 5, 2025
Merged

Port Frontier Clothes #1388

merged 6 commits into from
Jan 5, 2025
+4,245 −15

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented Dec 31, 2024 •
edited
Loading

Co-authored-by: KyuPolaris [email protected]
Co-authored-by: sleepyyapril [email protected]

Description

This is a port of
TheDenSS14/TheDen#42
TheDenSS14/TheDen#109
Thanks a bunch April!

This is mainly adding a ton of clothing items from Frontier.

Media

image

image

Changelog

🆑

  • add: Ported a ton of new clothing items from Frontier

sleepyyapril and others added 3 commits December 31, 2024 14:06
@sleepyyapril @VMSolidus
Merge pull request Simple-Station#42 from TheDenSS14/clothing-max
e735b13 
Frontier Clothes and Armor
@KyuPolaris @sleepyyapril @VMSolidus
Added Frontier Jackets to Loadout (Simple-Station#109)
d7fde9c 
Adds the Frontier Outpost Jackets to the loadouts for Civilians

---

- [x] Created TheDen specific CharacterItemGroups folder (for further
use with loadouts)
- [x] Added yml file for outerclothing and put jackets inside

---

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/de1195cb-0e9e-4656-b3f5-2c18968f286c)

![image](https://github.com/user-attachments/assets/7af66438-3df7-4430-b001-44029061a136)

</p>
</details>

---

:cl:
- add: New Jackets and Bombers have been added to loadout

---------

Co-authored-by: KyuPolaris <[email protected]>
Co-authored-by: sleepyyapril <[email protected]>
@KyuPolaris @sleepyyapril @VMSolidus
Added Frontier Jackets to Loadout (Simple-Station#109)
fc91596 
Adds the Frontier Outpost Jackets to the loadouts for Civilians

---

- [x] Created TheDen specific CharacterItemGroups folder (for further
use with loadouts)
- [x] Added yml file for outerclothing and put jackets inside

---

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/de1195cb-0e9e-4656-b3f5-2c18968f286c)

![image](https://github.com/user-attachments/assets/7af66438-3df7-4430-b001-44029061a136)

</p>
</details>

---

:cl:
- add: New Jackets and Bombers have been added to loadout

---------

Co-authored-by: KyuPolaris <[email protected]>
Co-authored-by: sleepyyapril <[email protected]>
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Dec 31, 2024
@VMSolidus VMSolidus changed the title Port-frontier-clothes Port Frontier Clothes Dec 31, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 31, 2024 •
edited
Loading

RSI Diff Bot; head commit 7da3a4e merging into 2178869
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Belt/chaplain_sash.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Belt/chaplain_sash_overlay.rsi

State Old New Status
book Added
bottle Added
censer Added
crucifix Added
stake Added

Resources/Textures/_NF/Clothing/Belt/punk.rsi

State Old New Status
base_belt_01 Added
decor_base_belt_01 Added
decor_base_belt_02 Added
decor_base_belt_03 Added
decor_base_belt_04 Added
decor_base_belt_05 Added
inhand-left Added
inhand-right Added
mask_null Added

Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi

State Old New Status
base_glasses_01 Added
base_glasses_02 Added
decor_base_glasses_01 Added
decor_base_glasses_02 Added
icon_base_glasses_01 Added
icon_base_glasses_02 Added
icon_decor_base_glasses_01 Added
icon_decor_base_glasses_02 Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/bishop_mitre.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/cardinal_hat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/kippah.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/pilgrim_hat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/widebrim_hat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/witch_hunter_hat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/cardinal_hood.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi

State Old New Status
base_halfmask_01 Added
decor_base_halfmask_01 Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Neck/Misc/crucifix.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Neck/Scarfs/chaplain_stole.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi

State Old New Status
base_OuterClothing_armor_01 Added
base_OuterClothing_armor_02 Added
base_OuterClothing_armor_03 Added
base_OuterClothing_armor_04 Added
base_OuterClothing_armor_05 Added
decor_base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_02 Added
decor_base_OuterClothing_armor_03 Added
decor_base_OuterClothing_armor_04 Added
decor_base_OuterClothing_armor_05 Added
decor_base_OuterClothing_armor_06 Added
icon_armor_01 Added
icon_armor_02 Added
icon_armor_03 Added
icon_armor_04 Added
icon_armor_05 Added
inhand-left Added
inhand-right Added
mask_null Added
overlay_base_OuterClothing_armor_01 Added
overlay_base_OuterClothing_armor_02 Added
overlay_base_OuterClothing_armor_03 Added
overlay_base_OuterClothing_armor_04 Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi

State Old New Status
base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_02 Added
decor_base_OuterClothing_armor_03 Added
decor_base_OuterClothing_armor_04 Added
decor_base_OuterClothing_armor_05 Added
mask_null Added
overlay_base_OuterClothing_armor_01 Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi

State Old New Status
base_OuterClothing_jacket_01 Added
base_OuterClothing_jacket_02 Added
base_OuterClothing_jacket_03 Added
base_OuterClothing_jacket_04 Added
base_OuterClothing_letterman Added
decor_base_OuterClothing_jacket_01 Added
decor_base_OuterClothing_jacket_02 Added
decor_base_OuterClothing_letterman Added
inhand-left Added
inhand-right Added
mask_null Added
overlay_base_OuterClothing_jacket_01 Added
overlay_base_OuterClothing_jacket_02 Added
overlay_base_OuterClothing_jacket_03 Added
overlay_base_OuterClothing_jacket_04 Added
overlay_base_OuterClothing_jacket_05 Added
overlay_base_OuterClothing_jacket_06 Added
overlay_base_OuterClothing_jacket_07 Added

Resources/Textures/_NF/Clothing/OuterClothing/Misc/bishop_robe.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Misc/cardinal_robe.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Misc/witch_hunter_coat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Vests/mercwebvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi

State Old New Status
base_boots_01 Added
decor_base_boots_01 Added
decor_base_boots_02 Added
inhand-left Added
inhand-right Added
mask_null Added

Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi

State Old New Status
base_leg_short Added
base_leg_standard Added
base_torso_armless Added
base_torso_croptop_armless Added
decor_base_leg_short_01 Added
decor_base_leg_short_02 Added
decor_base_leg_short_03 Added
decor_base_leg_short_04 Added
decor_base_leg_standard_01 Added

Edit: diff updated after 7da3a4e

@sleepyyapril
Copy link
Contributor

literally cannot review this without lagging so lets hope its good!

@VMSolidus VMSolidus merged commit 48ac2d2 into Simple-Station:master Jan 5, 2025
12 of 13 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 5, 2025
@SimpleStation14
Automatic Changelog Update (#1388)
7cffc48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sleepyyapril sleepyyapril sleepyyapril approved these changes

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@VMSolidus @sleepyyapril @KyuPolaris