Skip to content

Commit

Permalink
Merge pull request #637 from JustKekc/я-точно-ушёл-с-ВП
Browse files Browse the repository at this point in the history
респрайты: сервисник, бармен, жилетка, апрон, сет реджи, какава.
  • Loading branch information
PyotrIgn authored Apr 20, 2024
2 parents 061d99e + 634bf6f commit b6c9097
Show file tree
Hide file tree
Showing 72 changed files with 63 additions and 46 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ent-ADTClothingHandsNovaGloves = перчатки Новы
.desc = Это перчатки Новы. Как она их получила? Секрет.
ent-ADTClothingHandsRedjiGloves = Перчатки старика Реджи
.desc = Старая пара перчаток без пальцев
.desc = Старая пара перчаток. Скорее всего беспалыми они стали со временем.
ent-ADTClothingHandsRabbitGloves = кроличьи перчатки
.desc = Ох. Фурри.
Expand Down
8 changes: 4 additions & 4 deletions Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ ent-ADTClothingUniformPriestPrimalSuit = традиционный наряд ж
ent-ADTClothingUniformJumpsuitMaugly = штурмовой костюм "Маугли"
.desc = Удобный и прочный современный штурмовой костюм из плотной палаточной хлопчатобумажной ткани, который хорошо показал себя на войне в джунглях.
.suffix = { "" }
ent-ADTClothingUniformRedgiJumpskirt = юбка-костюм заведующей отелем
.desc = Потёртый, но от того не менее стильный, костюм для женской половины персонала
ent-ADTClothingUniformRedjiJumpskirt = юбка-костюм заведующей отелем
.desc = Как гласит официальное заявление, НТ выпустило этот вариант формы из-за многочисленных жалоб со стороны женской половины барменов, поскольку изначально был только мужской костюм. В действительности это волновало человека 3 от силы.
.suffix = { "" }
ent-ADTClothingUniformRedgiSuit = костюм заведующего отелем
.desc = Потёртый, но от того не менее стильный, костюм
ent-ADTClothingUniformRedjiSuit = костюм заведующего отелем
.desc = Легенды гласят, что в этот костюм пренадлежал некоему Реджинальду, что разливал всем корневое пиво.
.suffix = { "" }
ent-ADTClothingUniformNewBarmanSuit = обновлённый костюм бармена
.desc = Обновлённый комплект одежды для более изысканого разлития напитков
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ent-ADTClothingOuterJacketBartender = барная жилетка
.desc = удобная барная жилетка для повседневной носки.
.desc = Удобная и стильная жилетка. Смотрите, не испорьте удобство и стиль разлитым напитком.
.suffix = { "" }
ent-ADTClothingOuterCoatPyotrCoat = шинель Петра Шахина
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-ADTReagentContainerCocoaSolid = пачка какао-порошка
.desc = Большая пачка порошкового какао. Разбавьте водой перед употреблением!
.desc = Большая пачка порошкового какао. Разбавьте водой перед употреблением! Упаковка выглядет крайне знакомой, однако почему понять трудно.
12 changes: 12 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -699,3 +699,15 @@
- type: Tag
tags:
- WhitelistChameleon

#nope_ingeneer когда-то давно.
- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatRedji
name: Redji hat
description: stylish hat
components:
- type: Sprite
sprite: ADT/Clothing/Head/Hats/redji_hat.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/redji_hat.rsi
11 changes: 0 additions & 11 deletions Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/redji_hat.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,14 @@
#nope_ingeneer
- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformRedgiJumpskirt
name: Redgi skirt
description: this shit isnt fucking work
id: ADTClothingUniformRedjiJumpskirt
name: Redji skirt
description: this shit isnt fucking work. UPD(By JustKekc); it does.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi

- type: entity
parent: ClothingUniformBase
Expand Down
10 changes: 7 additions & 3 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@
#nope_ingeneer
- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformRedgiSuit
name: Redgi suit
description: An old and stylish suit that old Redgi wear somedays before.
id: ADTClothingUniformRedjiSuit
name: Redji suit
description: An old and stylish suit that old man Redji used to wear. No one really knows him, but his uniform became popular, especially with Pun Puns.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi
Expand Down Expand Up @@ -126,6 +126,10 @@
sprite: ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi
clothingVisuals:
jumpsuit:
- state: equipped-INNERCLOTHING
- state: equipped-INNERCLOTHING-apron

#Pyotr
- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
ClothingEyesHudBeer: 2
ClothingEyesEyepatchHudBeer: 2
ClothingHeadsetService: 2
ClothingOuterApronBar: 2
#ClothingOuterApronBar: 2 #Респрайт сразу 2 апрона затрагивает. *Они буквально одинаковые, только один без линии.*
ADTClothingOuterJacketBartender: 2
ADTClothingOuterApronBar: 2
ClothingOuterWinterBar: 2
ClothingUniformJumpsuitBartender: 2
ClothingUniformJumpskirtBartender: 2
ADTClothingUniformNewBarmanSuit: 2
ADTClothingUniformNewBarmanSkirt: 2
#ClothingUniformJumpsuitBartender: 2 #Не вижу смысла в старой.
#ClothingUniformJumpskirtBartender: 2
ClothingUniformJumpsuitBartenderPurple: 2
ClothingShoesColorBlack: 2
ClothingOuterArmorBasicSlim: 2
ClothingOuterVest: 2
ClothingBeltBandolier: 2
ClothingEyesGlassesSunglasses: 2
ADTClothingUniformRedgiSuit: 2
ADTClothingUniformRedgiJumpskirt: 2
ADTClothingUniformRedjiSuit: 2
ADTClothingUniformRedjiJumpskirt: 2
ADTClothingHandsRedjiGloves: 2
ADTClothingHeadHatRedji: 2
ADTClothingRedjiShoes: 2
ADTClothingOuterJacketBartender: 2
ADTClothingUniformNewBarmanSuit: 2
ADTClothingUniformNewBarmanSkirt: 2
ADTClothingOuterApronBar: 2
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.
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by keks code by nope_ingeneer",
"copyright": "Made by nope_ingeneer, sprites by JustKekc",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "sprite by Keks code by nopeingeneer",
"copyright": "Made by nope_ingeneer, sprites by JustKekc",
"size": {
"x": 32,
"y": 32
Expand Down
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.
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by nope_ingeneer",
"copyright": "Created by nope_ingeneer, sprites by JustKekc",
"size": {
"x": 32,
"y": 32
Expand Down
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.
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "ADT Team",
"copyright": "ADT Team, resprite by JustKekc.",
"size": {
"x": 32,
"y": 32
Expand Down
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.
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by nope_ingeneer",
"copyright": "Created by nope_ingeneer, sprites by JustKekc",
"size": {
"x": 32,
"y": 32
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by nope_ingeneer",
"copyright": "Created by nope_ingeneer, sprites by JustKekc",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by nope_ingeneer",
"copyright": "Created by nope_ingeneer, sprites by JustKekc",
"size": {
"x": 32,
"y": 32
Expand All @@ -21,6 +21,10 @@
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
}
]
}
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by nope_ingeneer",
"copyright": "Created by nope_ingeneer, sprites by JustKekc",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by nope_ingeneer",
"copyright": "Created by nope_ingeneer, sprites by JustKekc.",
"size": {
"x": 32,
"y": 32
Expand All @@ -21,6 +21,10 @@
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-apron",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by nope_ingeneer",
"copyright": "Created by nope_ingeneer, sprites by JustKekc",
"size": {
"x": 32,
"y": 32
Expand All @@ -21,6 +21,10 @@
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Created by Adventure Times MRP",
"copyright": "Created by Adventure Times MRP, resprite by JustKekc.",
"states": [ { "name": "icon" } ]
}

0 comments on commit b6c9097

Please sign in to comment.