-
Notifications
You must be signed in to change notification settings - Fork 585
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
Displacement maps for Vulpas and Reptiles #2447
base: master
Are you sure you want to change the base?
Conversation
Много удалений... Это требуется
RSI Diff Bot; head commit 57e9cdf merging into 983d7e3 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/winterboots.rsi
Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi
Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi
Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi
Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi
Resources/Textures/Clothing/Shoes/Boots/winterbootssec.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/leather.rsi
Resources/Textures/Clothing/Shoes/Misc/snakeskin.rsi
Resources/Textures/Clothing/Shoes/Misc/tourist.rsi
Resources/Textures/Clothing/Shoes/Specific/chef.rsi
Resources/Textures/Clothing/Shoes/Specific/cult.rsi
Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi
Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi
Resources/Textures/Clothing/Shoes/Specific/swat.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
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/loungewear.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/web.rsi
Resources/Textures/Corvax/Mobs/Species/displacement.rsi
|
файноли |
Finally blyat'... |
Nakonec-to... |
Vulpas and unathi |
Я ждал этого момента четыре...Нет, пять тысяч лет |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…k/Litogin/add-dm # Conflicts: # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
Почему только для цветных? Потому что у обуви уж много разновидностей, и подводить под один стандарт и так, чтобы было красиво - не возможно
Оно мертво? |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Скоро продолжу |
dc137b1
to
c971ab9
Compare
@Litogin работа ещё ведётся и будет в близжайшее время завершена? |
💀 |
Описание PR
Добавление карт смещений, для вульп и унатхов, для дальнейших апсримов и правильного отображения текстур одежды
Исправляет:
#2314
Проверки
Изменения
🆑 Litogin