-
Notifications
You must be signed in to change notification settings - Fork 47
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
Добавление супа из опилок, костюма горничной, изменение продвинутой аптечки и добавление перевода #462
Changes from 3 commits
d1be81a
77988ee
487e05d
5bbbb30
13e3950
426f291
7614dda
1be28fe
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,4 @@ | ||
ent-ADTClothingJumpBoots = прыжковые ботинки | ||
ent-ADTClothingJumpBootsSynd = кроваво-красные прыжковые ботинки | ||
.desc = Выглядят тяжелыми... Пока вы ими не воспользуетесь. | ||
ent-ADTClothingJumpBootsSynd = кроваво-красные прыжковые ботинки | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
---|---|---|
|
@@ -199,3 +199,6 @@ ent-ADTClothingUniformInvestigatorSuit = форма следователя Сл | |
ent-ADTClothingUniformNewMekka = униформа Новой Мекки | ||
.desc = Эта униформа имеет очень долгую и кровавую историю... | ||
.suffix = { "Новая Мекка" } | ||
|
||
ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. посмотри лучше на id и на название файла куда ты это впихнул |
||
.desc = Обновленный костюм горничной от НТ. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTFoodSoupSawdust = суп с опилками | ||
.desc = Ешьте, ведь потом вам нужно будет топить генератор... |
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 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,7 +84,7 @@ | |
- id: ClothingMaskClown | ||
- id: ClothingMaskMime | ||
- id: ClothingShoesClown | ||
- id: ClothingUniformJumpskirtJanimaid | ||
# - id: ClothingUniformJumpskirtJanimaid ADT Tweak | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Одно мы заккоментили полностью, а снизу написали еще раз... ни пон |
||
- id: ClothingNeckCloakVoid | ||
- id: RevolverCapGun | ||
- id: BarberScissors | ||
|
@@ -93,6 +93,7 @@ | |
- id: ClownRecorder | ||
- id: ClothingBeltSuspendersRed | ||
- id: ClothingBeltSuspendersBlack | ||
- id: ADTClothingUniformJumpskirtJanimaid #ADT Tweak | ||
|
||
- type: entity | ||
id: CrateServiceCustomSmokable | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -81,10 +81,13 @@ | |
components: | ||
- type: StorageFill | ||
contents: | ||
- id: BurnAutoInjector | ||
- id: BruteAutoInjector | ||
- id: RadAutoInjector | ||
- id: AntiPoisonMedipen | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. С днем комментариев ~ |
||
- id: MedicatedSuture | ||
- id: RegenerativeMesh | ||
- id: Bloodpack | ||
amount: 2 | ||
|
||
- type: entity | ||
id: MedkitCombatFilled | ||
|
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 | ||
} | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord: Mascot_valeraCreated for Adventure Time. bowl Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. escargot from tgstation at https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955.", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
|
||
{ | ||
"name": "bowl" | ||
}, | ||
{ | ||
"name": "soupsawdust" | ||
} | ||
] | ||
} |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Это вообще что? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Это я просто исправил под нормальный формат |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by Adventure Time", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by Adventure Times MRP", | ||
"states": [ | ||
{ | ||
"name": "khachapuri" | ||
} | ||
] | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Спорный файл но как бы.. Ок