-
Notifications
You must be signed in to change notification settings - Fork 47
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
Conversation
RSI Diff Bot; head commit 5b8c9ad merging into e6dd371 Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi
Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi
Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi
Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi
Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi
Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi
Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi
Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi
Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi
Resources/Textures/Clothing/OuterClothing/Bio/general.rsi
Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi
Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi
Resources/Textures/Clothing/OuterClothing/Bio/security.rsi
Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi
Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi
Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi
Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi
Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi
Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi
Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi
Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi
Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi
Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi
Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi
Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi
Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi
Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi
Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi
Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi
Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi
Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi
Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi
Resources/Textures/Clothing/Shoes/Boots/explorer.rsi
Resources/Textures/Clothing/Shoes/Boots/highheelboots.rsi
Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi
Resources/Textures/Clothing/Shoes/Boots/laceups.rsi
Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi
Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi
Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi
Resources/Textures/Clothing/Shoes/Boots/magboots.rsi
Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi
Resources/Textures/Clothing/Shoes/Boots/performer.rsi
Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi
Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi
Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi
Resources/Textures/Clothing/Shoes/Boots/workboots.rsi
Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi
Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi
Resources/Textures/Clothing/Shoes/Misc/flippers.rsi
Resources/Textures/Clothing/Shoes/Misc/leather.rsi
Resources/Textures/Clothing/Shoes/Misc/slippers.rsi
Resources/Textures/Clothing/Shoes/Misc/snakeskin.rsi
Resources/Textures/Clothing/Shoes/Misc/tourist.rsi
Resources/Textures/Clothing/Shoes/Specific/bling.rsi
Resources/Textures/Clothing/Shoes/Specific/chef.rsi
Resources/Textures/Clothing/Shoes/Specific/clown.rsi
Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi
Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi
Resources/Textures/Clothing/Shoes/Specific/cult.rsi
Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi
Resources/Textures/Clothing/Shoes/Specific/jester.rsi
Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi
Resources/Textures/Clothing/Shoes/Specific/skates.rsi
Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi
Resources/Textures/Clothing/Shoes/Specific/swat.rsi
Resources/Textures/Clothing/Shoes/Specific/wizard.rsi
Resources/Textures/Clothing/Under/Socks/bee.rsi
Resources/Textures/Clothing/Under/Socks/coder.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_agent.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
мердж конфлитов нет, тесты работают
657f6b6
Смотреть название
no cl