Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Добавление супа из опилок, костюма горничной, изменение продвинутой аптечки и добавление перевода #462

Merged
merged 8 commits into from
Sep 15, 2024
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ flavor-complex-businessconversation = как горечь, алкоголь и
flavor-complex-applemartini = как алкоголь и зелёное яблоко
flavor-complex-bacardiapple = как ром с привкусом яблока
flavor-complex-elderguards = как закон и очень странная смесь алкоголя с нотками уксуса
flavor-complex-limeshade = как теплая тень с лаймовым привкусом
flavor-complex-ADTSawdust = как 24-ая смена за день в лютый мороз
flavor-complex-limeshade = как теплая тень с лаймовым привкусом

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Спорный файл но как бы.. Ок

Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-ADTClothingJumpBoots = прыжковые ботинки
ent-ADTClothingJumpBootsSynd = кроваво-красные прыжковые ботинки
.desc = Выглядят тяжелыми... Пока вы ими не воспользуетесь.
ent-ADTClothingJumpBootsSynd = кроваво-красные прыжковые ботинки
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ну будущее, это можно было прописать как .desc = { ent-ADTClothingJumpBoots.desc }

.desc = Выглядят тяжелыми... Пока вы ими не воспользуетесь.
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ ent-ADTQMJumpskirtWarm = водолазка квартирмейстера

ent-ADTHOSJumpskirtWarm = { ent-ClothingUniformJumpsuitHoSAlt }
.desc = { ent-ClothingUniformJumpsuitHoSAlt.desc }

ent-ADTRDJumpskirtWarm = { ent-ClothingUniformJumpsuitResearchDirector }
.desc = { ent-ClothingUniformJumpsuitResearchDirector.desc }

Expand All @@ -110,4 +110,7 @@ ent-ClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка
.desc = Белая удобная водолазка с юбкой для Офицера Синего Щита с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск.

ent-ADTClothingJumpskirtHopAlt = деловой костюм с юбкой главы персонала
.desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить.
.desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить.

ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной
.desc = Обновленный костюм горничной от НТ.
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,11 @@ ent-ADTClothingUniformNewMekka = униформа Новой Мекки
.suffix = { "Новая Мекка" }

ent-ADTClothingJumpsuitHopAlt = деловой костюм главы персонала
.desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить.
.desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить.
ent-ADTClothingJumpsuitSecOffMogesBrown = костюм офицера СБ с Могеса
.desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса!
.desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса!
ent-ADTClothingJumpsuitSecOffMogesBlue = костюм офицера СБ с Могеса
.desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса!
ent-ADTClothingJumpsuitSecOffMogesGray = костюм офицера СБ с Могеса
.desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса!

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTFoodSoupSawdust = суп с опилками
.desc = Ешьте, ведь потом вам нужно будет топить генератор...
38 changes: 26 additions & 12 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
description: Warm and comfy.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi
- type: StaticPrice
Expand All @@ -55,7 +55,7 @@
description: Brighter shade of blue.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi
- type: StaticPrice
Expand All @@ -68,7 +68,7 @@
description: Filled with happines.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi
- type: StaticPrice
Expand All @@ -81,7 +81,7 @@
description: Cheaper analog of CentComm turtleneck.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi
- type: StaticPrice
Expand All @@ -94,7 +94,7 @@
description: -Ya know why i wear red? It hides blood well! -But that's brown color...
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi
- type: StaticPrice
Expand All @@ -107,7 +107,7 @@
description: Hides blood of clowns well!
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi
- type: StaticPrice
Expand All @@ -120,7 +120,7 @@
description: I don't want to talk about it.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi
- type: StaticPrice
Expand All @@ -133,7 +133,7 @@
description: Who would wear this?
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi
- type: StaticPrice
Expand All @@ -146,7 +146,7 @@
description: Grey style?
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi
- type: StaticPrice
Expand All @@ -159,7 +159,7 @@
description: Darker shade of azure.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi
- type: StaticPrice
Expand All @@ -172,7 +172,7 @@
description: Feel yourself like a real scientist.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi
- type: StaticPrice
Expand All @@ -185,7 +185,7 @@
description: Favourite clothes of bookworms.
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi
- type: StaticPrice
Expand Down Expand Up @@ -250,6 +250,19 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi


- type: entity
parent: ClothingUniformSkirtBase
id: ADTClothingUniformJumpskirtJanimaid
name: janitorial maid uniform
description: For professionals, not the posers.
suffix: ADT
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi

#Альтернативная одежда для ГП
- type: entity
parent: ClothingUniformBase
Expand Down Expand Up @@ -286,3 +299,4 @@
- state: icon_vest
map: ["foldedLayer"]
visible: false

87 changes: 87 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
- type: entity
parent: FoodBase
id: ADTFoodBowlBase
abstract: true
components:
- type: Item
storedRotation: -90
- type: Food
trash:
- FoodBowlBig
utensil: Spoon
- type: SolutionContainerManager
solutions:
food:
maxVol: 20
reagents:
- ReagentId: Nutriment
Quantity: 20
- type: Sprite
sprite: ADT/Objects/Consumable/Food/bowl.rsi
- type: DamageOnLand
damage:
types:
Blunt: 5
- type: DamageOtherOnHit
damage:
types:
Blunt: 5
- type: Spillable
solution: food
# soup weapon!
- type: MeleeWeapon
soundNoDamage:
path: "/Audio/Effects/Fluids/splat.ogg"
damage:
types:
Blunt: 0
- type: Damageable
damageContainer: Inorganic
- type: Tag
tags:
- Soup
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 5
behaviors:
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
params:
volume: -8
- !type:SpillBehavior { }
- !type:SpawnEntitiesBehavior
spawn:
FoodBowlBigTrash:
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]

- type: entity
name: sawdust soup
parent: ADTFoodBowlBase
id: ADTFoodSoupSawdust
description: Where did the soup come from in my sawdust?
components:
- type: FlavorProfile
flavors:
- ADTSawdust
- type: Sprite
layers:
- state: bowl
- state: soupsawdust
- type: SolutionContainerManager
solutions:
food:
maxVol: 21
reagents:
- ReagentId: Nutriment
Quantity: 3
- ReagentId: Vitamin
Quantity: 3
- ReagentId: Water
Quantity: 15

5 changes: 5 additions & 0 deletions Resources/Prototypes/ADT/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,8 @@
flavorType: Complex
description: flavor-complex-limeshade

# Суп
- type: flavor
id: ADTSawdust
flavorType: Complex
description: flavor-complex-ADTSawdust
18 changes: 15 additions & 3 deletions Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,22 @@
name: Khachapuri recipe
result: ADTFoodMealKhachapuri
time: 15
reagents:
reagents:
Egg: 12
TableSalt: 5
Milk: 5
solids:
solids:
FoodCheeseSlice: 1
FoodBreadPlainSlice: 1
FoodBreadPlainSlice: 1

- type: microwaveMealRecipe
id: ADTFoodSawdustSoupRecipe
name: sawdust soup recipe
result: ADTFoodSoupSawdust
time: 15
reagents:
Water: 10
TableSalt: 10
solids:
FoodBowlBig: 1
MaterialWoodPlank1: 1
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Crates/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
- id: ClothingMaskClown
- id: ClothingMaskMime
- id: ClothingShoesClown
- id: ClothingUniformJumpskirtJanimaid
# - id: ClothingUniformJumpskirtJanimaid ADT Tweak
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Одно мы заккоментили полностью, а снизу написали еще раз... ни пон

- id: ClothingNeckCloakVoid
- id: RevolverCapGun
- id: BarberScissors
Expand All @@ -93,6 +93,7 @@
- id: ClownRecorder
- id: ClothingBeltSuspendersRed
- id: ClothingBeltSuspendersBlack
- id: ADTClothingUniformJumpskirtJanimaid #ADT Tweak

- type: entity
id: CrateServiceCustomSmokable
Expand Down
7 changes: 6 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,15 @@
components:
- type: StorageFill
contents:
# ADT Tweak start
- id: BurnAutoInjector
- id: BruteAutoInjector
- id: RadAutoInjector
- id: AntiPoisonMedipen
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

С днем комментариев ~

# ADT Tweak End
- id: MedicatedSuture
- id: RegenerativeMesh
- id: Bloodpack
amount: 2

- type: entity
id: MedkitCombatFilled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
- FoodSoupOnion
- FoodSoupBisque
- FoodSoupBungo
- ADTFoodSoupSawdust #ADT tweak
- FoodMealCornInButter
- FoodSoupStew
chance: 0.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@
parent: Medkit
id: MedkitAdvanced
components:
#ADT Tweak
- type: Storage
grid:
- 0,0,4,1
#ADT Tweak
- type: Sprite
state: advkit
- type: Item
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.
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
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made for digimortal's Adventure Time(Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading