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

Revert "Mergup" #33

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Revert "Mergup" #33

merged 1 commit into from
Jan 7, 2025

Conversation

Aidenkrz
Copy link
Contributor

@Aidenkrz Aidenkrz commented Jan 7, 2025

Reverts #32

Copy link
Contributor

github-actions bot commented Jan 7, 2025

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

Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/Clothing/Head/Misc/head_mirror.rsi

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

Resources/Textures/Clothing/Mask/gascaptaincombat.rsi

State Old New Status
equipped-MASK-reptilian Removed
equipped-MASK-vox Removed
equipped-MASK-vulpkanin Removed
equipped-MASK Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi

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

Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi

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

Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

State Old New Status
equipped-HELMET Removed
icon Removed

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

State Old New Status
equipped-HELMET Removed
icon Removed

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

State Old New Status
equipped-HELMET Removed
icon Removed

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

State Old New Status
equipped-HELMET Removed
icon Removed

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

State Old New Status
equipped-HELMET Removed
icon Removed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@Aidenkrz Aidenkrz merged commit 6234849 into main Jan 7, 2025
9 checks passed
@Aidenkrz Aidenkrz deleted the revert-32-mergup branch January 12, 2025 01:25
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.

1 participant