search

AdventureTimeSS14 / space_station_ADT

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

723 #84

Closed themanyfaceddemon closed 5 days ago

themanyfaceddemon commented 3 months ago

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

Conflicts:

Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl

Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml

Resources/Changelog/ChangelogADT.yml

Resources/Prototypes/Catalog/Fills/Crates/service.yml

no cl

github-actions[bot] commented 3 months ago

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING-monkey | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/3b5cf73a24641d34a609b729e734a7fae1ac7290/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING-monkey.png) | Added | equipped-INNERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/3b5cf73a24641d34a609b729e734a7fae1ac7290/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/3b5cf73a24641d34a609b729e734a7fae1ac7290/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/3b5cf73a24641d34a609b729e734a7fae1ac7290/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/3b5cf73a24641d34a609b729e734a7fae1ac7290/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png) | Added

github-actions[bot] commented 2 months ago

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