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

Frontier Clothes #448

Merged
merged 8 commits into from
Jan 8, 2025
Merged

Frontier Clothes #448

merged 8 commits into from
Jan 8, 2025

Conversation

Fansana
Copy link
Owner

@Fansana Fansana commented Jan 1, 2025

🆑

  • add: Added lots of punk clothing from frontier
  • add: Added chaplain clothing: sash Crucifix

sleepyyapril and others added 6 commits January 1, 2025 09:19
@Fansana
Merge pull request #42 from TheDenSS14/clothing-max
7e6490a 
Frontier Clothes and Armor
@KyuPolaris @Fansana
Added Frontier Jackets to Loadout (#109)
f88ece9 
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 @Fansana
Added Frontier Jackets to Loadout (#109)
943cc9c 
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]>
@VMSolidus @Fansana
Fix Linter
3f86465
@Fansana
fixes
096ef8a
@Fansana
add chaplain sash
90bc524
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files and removed Status: Needs Review Someone please review this labels Jan 1, 2025
@Floof-Station-Bot Floof-Station-Bot changed the title Frontier clothes Frontier Clothes Jan 1, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 1, 2025 •
edited
Loading

RSI Diff Bot; head commit 464041d merging into e9c50af
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

Edit: diff updated after 464041d

@github-actions github-actions bot added Status: Needs Review Someone please review this Status: Merge Conflict FIX YOUR PR AAAGH labels Jan 4, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 4, 2025

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

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 5, 2025
Mnemotechnician
Mnemotechnician reviewed Jan 5, 2025
View reviewed changes
Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -116,6 +116,7 @@
- type: Tag
tags:
- Trash
- Ash # Frontier
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm not sure we have the ash tag on floof/ee. It's why I added the Burnt tag to the ash entity in my bugfix PR, and it may be the reason tests are failing here.

Copy link
Owner Author

Choose a reason for hiding this comment

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

image
ash is there

@Fansana Fansana merged commit 33677a4 into master Jan 8, 2025
13 checks passed
Floof-Station-Bot added a commit that referenced this pull request Jan 8, 2025
@Floof-Station-Bot
Automatic Changelog Update (#448)
8187d49
@Mnemotechnician Mnemotechnician mentioned this pull request Jan 8, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mnemotechnician Mnemotechnician Mnemotechnician left review comments

@Memeji Memeji Awaiting requested review from Memeji Memeji is a code owner

@FoxxoTrystan FoxxoTrystan Awaiting requested review from FoxxoTrystan FoxxoTrystan is a code owner

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Fansana @Mnemotechnician @sleepyyapril @KyuPolaris @VMSolidus