Skip to content

Clothing port#1

Open
Generic-Eagle wants to merge 47 commits into
warcrazed11:masterfrom
Generic-Eagle:Civil-Protection-Uniform-Port
Open

Clothing port#1
Generic-Eagle wants to merge 47 commits into
warcrazed11:masterfrom
Generic-Eagle:Civil-Protection-Uniform-Port

Conversation

@Generic-Eagle

@Generic-Eagle Generic-Eagle commented Apr 29, 2026

Copy link
Copy Markdown
Collaborator

Ports most clothing from HL13. Citizen, combine, and resistance.

@github-actions

github-actions Bot commented Apr 29, 2026

Copy link
Copy Markdown

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

Resources/Textures/Mobs/Species/Human/parts.rsi

State Old New Status
full Modified
head_f Modified
head_m Modified
l_arm Modified
l_foot Modified
l_hand Modified
l_leg Modified
r_arm Modified
r_foot Modified
r_hand Modified
r_leg Modified
torso_f Modified
torso_m Modified

Resources/Textures/_HL13/Objects/Clothing/Back/civilprotectionsatchel.rsi

State Old New Status
closed Added
equipped-BACKPACK Added
icon Added
open Added

Resources/Textures/_HL13/Objects/Clothing/Hands/Gloves/Citizen/cwuforemangloves.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Hands/Gloves/Citizen/cwusciencegloves.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Hands/Gloves/Citizen/cwutechniciangloves.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Hands/Gloves/Combine/civilprotectiongloves.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Hands/Gloves/Combine/otagloves.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Head/Helmets/Citizen/cwucleanuphelmet.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Head/Helmets/Citizen/cwusciencehelmet.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Citizen/technicalmask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/civilprotectionmask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/crematormask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/dvlmask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/epumask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/helixmask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/otadaggermask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/otaechomask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/otaelitemask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/otagruntmask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/otasuppressor.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/otawallhammermask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Masks/Combine/sectorialmask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Anticitizen/rebelheavyvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Anticitizen/rebellightvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/assassinvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/civilprotectiontrench.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/civilprotectionvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/crematorjacket.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/daggervest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/dvltrench.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/elitevest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/epuvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/helixvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/otabluevest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/sectorialtrench.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/suppressorvest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Armor/Combine/wallhammervest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Jackets/bluecitizenjacket.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Jackets/greencitizenjacket.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Jackets/prisonerjacket.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Jackets/whitecitizenjacket.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Misc/cwucleanupbiosuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Misc/cwuscientistbiosuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Misc/foremansuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/OuterClothing/Misc/techniciansuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Shoes/Boots/Citizen/cwuscienceboots.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Shoes/Boots/Citizen/cwutechnicianboots.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Shoes/Boots/Citizen/workboots.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Shoes/Boots/Combine/assassinboots.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Shoes/Boots/Combine/civilprotectionboots.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Shoes/Boots/Combine/otaboots.rsi

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

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Citizen/citizenjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
jacket-equipped-INNERCLOTHING Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Citizen/gmansuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Citizen/prisonerjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
jacket-equipped-INNERCLOTHING Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Citizen/refugeegreenjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Citizen/refugeetanjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Citizen/resistedprisonerjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
jacket-equipped-INNERCLOTHING Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/civilprotectionjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/dvljumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/epujumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/gridjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/otaassassinjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/otadaggerjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/otaechojumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/otaelitejumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/otagruntjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/otasuppressorjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_HL13/Objects/Clothing/Uniforms/Combine/sectorialjumpsuit.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Edit: diff updated after caeca6f

@Generic-Eagle Generic-Eagle changed the title Standard mask and uniform Combine Uniforms Apr 29, 2026
@warcrazed11

Copy link
Copy Markdown
Owner

pull upstream

@github-actions github-actions Bot added size/M and removed size/S labels May 1, 2026
@Generic-Eagle

Copy link
Copy Markdown
Collaborator Author

Honestly have no idea what linter is on about, what it seems to be mad about looks fine to me.

@github-actions github-actions Bot removed the size/M label May 7, 2026
@github-actions

Copy link
Copy Markdown

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

@Generic-Eagle

Copy link
Copy Markdown
Collaborator Author

Linter pass! Thank god. Took long enough. I'm not sure if I want to put things like belts and bags in this PR or a separate one... There's also some clothing still left from HL13 that I'm not sure we would want YET, like the HEV suit, Polish military stuff, and all the business suits for high ranking combine political figures, like the sector admin and labor lead.

@Generic-Eagle

Copy link
Copy Markdown
Collaborator Author

WHAT DOES THAT TEST EVEN MEAN! Doubt it's something I did so ignoring... Maybe because atmos is disabled?

@Generic-Eagle

Copy link
Copy Markdown
Collaborator Author

Something, presumably upstream, broke the "hidelayerclothing" component. I can't even get it to work in the way things are formatted for wizden. They worked just fine before, the way RMC has them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants