-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Добавлены шоколадные батончики (#153)
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR Перенос AdventureTimeSS14/space_station#332 **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. --------- Co-authored-by: 1Stepka1 <[email protected]> Co-authored-by: 1Stepka1 <[email protected]>
- Loading branch information
1 parent
8c6b232
commit 870372a
Showing
23 changed files
with
405 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+235 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-choco.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+282 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-coconut.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+329 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-energy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+327 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-nuts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+227 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-pink.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+321 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-two.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions
29
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord:prazat911", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "bar-choco" | ||
}, | ||
{ | ||
"name": "bar-coconut" | ||
}, | ||
{ | ||
"name": "bar-energy" | ||
}, | ||
{ | ||
"name": "bar-nuts" | ||
}, | ||
{ | ||
"name": "bar-pink" | ||
}, | ||
{ | ||
"name": "bar-two" | ||
} | ||
] | ||
} |
Binary file added
BIN
+436 Bytes
...ces/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/choco-packed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+332 Bytes
...s/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/coconut-packed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+394 Bytes
...es/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/energy-packed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions
29
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord:prazat911", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "choco-packed" | ||
}, | ||
{ | ||
"name": "coconut-packed" | ||
}, | ||
{ | ||
"name": "energy-packed" | ||
}, | ||
{ | ||
"name": "nuts-packed" | ||
}, | ||
{ | ||
"name": "pink-packed" | ||
}, | ||
{ | ||
"name": "two-packed" | ||
} | ||
] | ||
} |
Binary file added
BIN
+435 Bytes
...rces/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/nuts-packed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+430 Bytes
...rces/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/pink-packed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+425 Bytes
...urces/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/two-packed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+533 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/choco-trash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+487 Bytes
...rces/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/coconut-trash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+513 Bytes
...urces/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/energy-trash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.