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

Замена текстур унатхов на визденовские и удаление текстур одежды для унатхов #131

Merged
merged 4 commits into from
Jul 25, 2024

Conversation

Lonkuk
Copy link
Contributor

@Lonkuk Lonkuk commented Jul 15, 2024

Смотреть название

no cl

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# labels Jul 15, 2024
Copy link
Contributor

github-actions bot commented Jul 15, 2024

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

Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Bio/general.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Bio/security.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

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

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
open-equipped-OUTERCLOTHING-reptilian Removed

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

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
open-equipped-OUTERCLOTHING-reptilian Removed

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

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
open-equipped-OUTERCLOTHING-reptilian Removed

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

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
open-equipped-OUTERCLOTHING-reptilian Removed

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

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
open-equipped-OUTERCLOTHING-reptilian Removed

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

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
open-equipped-OUTERCLOTHING-reptilian Removed

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

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed
open-equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi

State Old New Status
equipped-OUTERCLOTHING-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/explorer.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/highheelboots.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/laceups.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi

State Old New Status
equipped-FEET-reptilian Removed
on-equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi

State Old New Status
equipped-FEET-reptilian Removed
on-equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi

State Old New Status
equipped-FEET-reptilian Removed
on-equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/magboots.rsi

State Old New Status
equipped-FEET-reptilian Removed
on-equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/performer.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi

State Old New Status
equipped-FEET-reptilian Removed
on-equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Boots/workboots.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Misc/flippers.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Misc/leather.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Misc/slippers.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Misc/snakeskin.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Misc/tourist.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/bling.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/chef.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/clown.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/cult.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/jester.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/skates.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/swat.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Shoes/Specific/wizard.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Under/Socks/bee.rsi

State Old New Status
equipped-FEET-reptilian Removed

Resources/Textures/Clothing/Under/Socks/coder.rsi

State Old New Status
equipped-FEET-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

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

State Old New Status
equipped-INNERCLOTHING-reptilian Removed

Edit: diff updated after 5b8c9ad

Copy link
Contributor

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

Copy link
Collaborator

@Ratyyy Ratyyy left a comment

Choose a reason for hiding this comment

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

мердж конфлитов нет, тесты работают

@Ratyyy Ratyyy added this pull request to the merge queue Jul 25, 2024
Merged via the queue into AdventureTimeSS14:master with commit 657f6b6 Jul 25, 2024
15 checks passed
@Schrodinger71 Schrodinger71 assigned Ratyyy and unassigned Lonkuk Jul 27, 2024
@Lonkuk Lonkuk deleted the Unathi branch August 7, 2024 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Изменение спрайтов No C#
Projects
None yet
2 participants