-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #637 from JustKekc/я-точно-ушёл-с-ВП
респрайты: сервисник, бармен, жилетка, апрон, сет реджи, какава.
- Loading branch information
Showing
72 changed files
with
63 additions
and
46 deletions.
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
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
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/cocoa_solid_pack.ftl
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 |
---|---|---|
@@ -1,2 +1,2 @@ | ||
ent-ADTReagentContainerCocoaSolid = пачка какао-порошка | ||
.desc = Большая пачка порошкового какао. Разбавьте водой перед употреблением! | ||
.desc = Большая пачка порошкового какао. Разбавьте водой перед употреблением! Упаковка выглядет крайне знакомой, однако почему понять трудно. |
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
11 changes: 0 additions & 11 deletions
11
Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/redji_hat.yml
This file was deleted.
Oops, something went wrong.
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
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 modified
BIN
-56 Bytes
(83%)
Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/equipped-HAND.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 modified
BIN
-15 Bytes
(96%)
Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/icon.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 modified
BIN
-66 Bytes
(78%)
Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-left.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 modified
BIN
-53 Bytes
(82%)
Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.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
Binary file removed
BIN
-486 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/equipped-HELMET.png
Binary file not shown.
Binary file removed
BIN
-412 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/icon.png
Binary file not shown.
Binary file removed
BIN
-266 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/inhand-left.png
Binary file not shown.
Binary file removed
BIN
-265 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/inhand-right.png
Binary file not shown.
Binary file added
BIN
+287 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/equipped-HELMET.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
+283 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/inhand-left.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
+284 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
...g/Head/Hats/old_stylish_hat.rsi/meta.json → ...lothing/Head/Hats/redji_hat.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
Binary file modified
BIN
-148 Bytes
(82%)
...res/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/equipped-OUTERCLOTHING.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 modified
BIN
-17 Bytes
(95%)
Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/icon.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 modified
BIN
-93 Bytes
(85%)
...urces/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-left.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 modified
BIN
-50 Bytes
(91%)
...rces/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.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
Binary file modified
BIN
-20 Bytes
(97%)
...extures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/equipped-OUTERCLOTHING.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 modified
BIN
-41 Bytes
(87%)
Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/icon.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 modified
BIN
-47 Bytes
(88%)
Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-left.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 modified
BIN
-33 Bytes
(91%)
Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.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
Binary file modified
BIN
-48 Bytes
(89%)
Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/equipped-FEET.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 modified
BIN
-17 Bytes
(94%)
Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/icon.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 modified
BIN
-13 Bytes
(97%)
Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-left.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 modified
BIN
-25 Bytes
(94%)
Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.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
Binary file modified
BIN
-25 Bytes
(98%)
...ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/equipped-INNERCLOTHING.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 modified
BIN
-28 Bytes
(95%)
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/icon.png
Oops, something went wrong.
Binary file modified
BIN
-39 Bytes
(94%)
...s/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-left.png
Oops, something went wrong.
Binary file modified
BIN
-71 Bytes
(90%)
.../Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-right.png
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.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
Binary file added
BIN
+1.08 KB
...T/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/equipped-INNERCLOTHING-monkey.png
Oops, something went wrong.
Binary file added
BIN
+1.21 KB
...ures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/equipped-INNERCLOTHING.png
Oops, something went wrong.
Binary file added
BIN
+571 Bytes
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/icon.png
Oops, something went wrong.
Binary file added
BIN
+551 Bytes
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/inhand-left.png
Oops, something went wrong.
Binary file added
BIN
+542 Bytes
...urces/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/inhand-right.png
Oops, something went wrong.
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 removed
BIN
-1.2 KB
...ures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/equipped-INNERCLOTHING.png
Diff not rendered.
Binary file removed
BIN
-488 Bytes
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/icon.png
Diff not rendered.
Binary file removed
BIN
-633 Bytes
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/inhand-left.png
Diff not rendered.
Binary file removed
BIN
-629 Bytes
...urces/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/inhand-right.png
Diff not rendered.
Binary file modified
BIN
-11 Bytes
(99%)
...s/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/equipped-INNERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
-37 Bytes
(93%)
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/icon.png
Oops, something went wrong.
Binary file modified
BIN
-39 Bytes
(94%)
...ces/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-left.png
Oops, something went wrong.
Binary file modified
BIN
-71 Bytes
(90%)
...es/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-right.png
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.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
Binary file added
BIN
+611 Bytes
...lothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING-apron.png
Oops, something went wrong.
Binary file modified
BIN
-98 Bytes
(94%)
.../ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
+1 Byte
(100%)
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/icon.png
Oops, something went wrong.
Binary file modified
BIN
-57 Bytes
(92%)
...es/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-left.png
Oops, something went wrong.
Binary file modified
BIN
-47 Bytes
(93%)
...s/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-right.png
Oops, something went wrong.
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
+1.14 KB
...ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING-monkey.png
Oops, something went wrong.
Binary file modified
BIN
+35 Bytes
(100%)
...xtures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING.png
Oops, something went wrong.
Binary file modified
BIN
+64 Bytes
(110%)
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/icon.png
Oops, something went wrong.
Binary file modified
BIN
-82 Bytes
(87%)
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-left.png
Oops, something went wrong.
Binary file modified
BIN
-87 Bytes
(86%)
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-right.png
Oops, something went wrong.
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 modified
BIN
+135 Bytes
(140%)
Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/icon.png
Oops, something went wrong.
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