search

AdventureTimeSS14 / space_station_ADT

Adventure Time Space Station(New Repositories)
MIT License
8 stars 29 forks source link

426 Обмотки для ног #81

Closed themanyfaceddemon closed 1 month ago

themanyfaceddemon commented 3 months ago

Перенос https://github.com/AdventureTimeSS14/space_station/pull/426

Conflicts:

Resources/Changelog/ChangelogADT.yml

Resources/Locale/ru-RU/ADT/Clothing/boots.ftl

Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

Resources/Textures/ADT/Clothing/Shoes/Boots/black_footwraps.rsi/equipped

-FEET-reptilian.png

Resources/Textures/ADT/Clothing/Shoes/Boots/blackhigh_footwraps.rsi/equi

pped-FEET-reptilian.png

Resources/Textures/ADT/Clothing/Shoes/Boots/white_footwraps.rsi/equipped

-FEET-reptilian.png

Resources/Textures/ADT/Clothing/Shoes/Boots/whitehigh_footwraps.rsi/equi

pped-FEET-reptilian.png

no cl

github-actions[bot] commented 3 months ago

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

Resources/Textures/ADT/Clothing/Shoes/Boots/black_footwraps.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET-reptilian | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/black_footwraps.rsi/equipped-FEET-reptilian.png) | Added

Resources/Textures/ADT/Clothing/Shoes/Boots/blackhigh_footwraps.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET-reptilian | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/blackhigh_footwraps.rsi/equipped-FEET-reptilian.png) | Added

Resources/Textures/ADT/Clothing/Shoes/Boots/brown_footwraps.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET-reptilian | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brown_footwraps.rsi/equipped-FEET-reptilian.png) | Added | equipped-FEET | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brown_footwraps.rsi/equipped-FEET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brown_footwraps.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brown_footwraps.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brown_footwraps.rsi/inhand-right.png) | Added

Resources/Textures/ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET-reptilian | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi/equipped-FEET-reptilian.png) | Added | equipped-FEET | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi/equipped-FEET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi/inhand-right.png) | Added

Resources/Textures/ADT/Clothing/Shoes/Boots/white_footwraps.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET-reptilian | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/white_footwraps.rsi/equipped-FEET-reptilian.png) | Added

Resources/Textures/ADT/Clothing/Shoes/Boots/whitehigh_footwraps.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET-reptilian | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/b0b13a5e632ec8a88f7bd22b7bba4b9d7cc24234/Resources/Textures/ADT/Clothing/Shoes/Boots/whitehigh_footwraps.rsi/equipped-FEET-reptilian.png) | Added

github-actions[bot] commented 2 months ago

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

Darkiich commented 1 month ago

Обмотки были сделаны. Закрываю ПР #289