AdventureTimeSS14 / space_station_ADT

MIT License
3 stars 11 forks source link

720 #85

Open themanyfaceddemon opened 4 days ago

themanyfaceddemon commented 4 days ago

Перенос https://github.com/AdventureTimeSS14/space_station/pull/720 Ебучий юзернейм

Про конфликты не ебу no cl

github-actions[bot] commented 4 days ago

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

Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK-hamster | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK-hamster.png) | Added | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/blue.rsi/inhand-right.png) | Added

Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK-hamster | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK-hamster.png) | Added | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/cyan.rsi/inhand-right.png) | Added

Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK-hamster | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK-hamster.png) | Added | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/green.rsi/inhand-right.png) | Added

Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK-hamster | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK-hamster.png) | Added | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/grey.rsi/inhand-right.png) | Added

Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK-hamster | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK-hamster.png) | Added | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/orange.rsi/inhand-right.png) | Added

Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK-hamster | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK-hamster.png) | Added | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/pink.rsi/inhand-right.png) | Added

Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK-hamster | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK-hamster.png) | Added | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Clothing/Neck/Pendants/red.rsi/inhand-right.png) | Added

Resources/Textures/Sirena/Structures/Decoration/crystal.rsi

| State | Old | New | Status | --- | --- | --- | --- | | crystal_blue | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue.png) | Added | crystal_blue_medium | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_medium.png) | Added | crystal_blue_small | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_blue_small.png) | Added | crystal_cyan | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan.png) | Added | crystal_cyan_medium | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_medium.png) | Added | crystal_cyan_small | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_cyan_small.png) | Added | crystal_green | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green.png) | Added | crystal_green_medium | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_medium.png) | Added | crystal_green_small | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_green_small.png) | Added | crystal_grey | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey.png) | Added | crystal_grey_medium | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_medium.png) | Added | crystal_grey_small | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_grey_small.png) | Added | crystal_orange | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange.png) | Added | crystal_orange_medium | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_medium.png) | Added | crystal_orange_small | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_orange_small.png) | Added | crystal_pink | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink.png) | Added | crystal_pink_medium | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_medium.png) | Added | crystal_pink_small | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_pink_small.png) | Added | crystal_red | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red.png) | Added | crystal_red_medium | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_medium.png) | Added | crystal_red_small | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystal_red_small.png) | Added | crystalshard_blue | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_blue.png) | Added | crystalshard_cyan | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_cyan.png) | Added | crystalshard_green | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_green.png) | Added | crystalshard_grey | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_grey.png) | Added | crystalshard_orange | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_orange.png) | Added | crystalshard_pink | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_pink.png) | Added | crystalshard_red | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/crystal.rsi/crystalshard_red.png) | Added

Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi

| State | Old | New | Status | --- | --- | --- | --- | | stalagmite1 | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite1.png) | Added | stalagmite2 | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite2.png) | Added | stalagmite3 | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite3.png) | Added | stalagmite4 | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite4.png) | Added | stalagmite5 | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/cf9bafb6a4bf487f40b00939d2bbb1b7889e9997/Resources/Textures/Sirena/Structures/Decoration/stalagmite.rsi/stalagmite5.png) | Added

Edit: diff updated after cf9bafb6a4bf487f40b00939d2bbb1b7889e9997