Open Schrodinger71 opened 4 days 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
Перенос 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