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

изменения маленькие #505

Merged
merged 2 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,21 @@
- type: SolutionContainerVisuals
maxFillLevels: 4
fillBaseName: icon-
- type: Item
size: Tiny

- type: entity
parent: DrinkGlassBase
id: ADTDrinkTeapot
name: teapot
description: An elegant teapot. It simply oozes class.
suffix: Пустой
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 100
- type: Item
size: Normal
- type: Sprite
sprite: Objects/Consumable/Drinks/teapot.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
state: icon
- type: MeleeWeapon
wideAnimationRotation: -135
attackRate: 0.7
attackRate: 0.8
damage:
types:
Slash: 13
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
collection: BoxingHit
- type: StaminaDamageOnHit
damage: 12
- type: Wieldable
#- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
startingInventory:
ADTBoxValentineWhite: 5
ADTBoxValentineRed: 5
ClothingHeadHatJester: 1
ClothingUniformJumpsuitJester: 1
ClothingHeadHatJesterAlt: 1
ClothingUniformJumpsuitJesterAlt: 1
ClothingHeadHatJester: 2
ClothingUniformJumpsuitJester: 2
ClothingHeadHatJesterAlt: 2
ClothingUniformJumpsuitJesterAlt: 2
ClothingShoesJester: 2
ClothingOuterWinterClown: 1
ClothingOuterWinterMime: 1
ClothingOuterWinterMusician: 1
ClothingOuterWinterClown: 2
ClothingOuterWinterMime: 2
ClothingOuterWinterMusician: 2
ClothingMaskJoy: 2
ClothingHeadHatCardborg: 2
ClothingOuterCardborg: 2
ClothingHeadHatSombrero: 2
ClothingOuterPonchoClassic: 2
ClothingHeadHatCardborg: 3
ClothingOuterCardborg: 3
ClothingHeadHatSombrero: 3
ClothingOuterPonchoClassic: 3
ClothingHeadHatPwig: 2
ClothingOuterRobesJudge: 2
ClothingOuterPoncho: 2
ClothingOuterPoncho: 4
ClothingHeadHatSantahat: 2
ClothingOuterSanta: 2
ClothingHeadHatSkub: 2
Expand All @@ -34,26 +34,26 @@
ClothingOuterRedRacoon: 2
# ClothingHeadPaperSack: 2
# ClothingHeadPaperSackSmile: 2
ClothingEyesBlindfold: 1
ClothingHeadRastaHat: 2
ClothingUniformJumpsuitDameDane: 2
ClothingShoesDameDane: 2
ClothingOuterDameDane: 2
ClothingOuterClownPriest: 1
ClothingMaskSadMime: 1
ClothingMaskScaredMime: 1
ClothingUniformJumpsuitKimono: 1
ClothingHeadHatCasa: 1
ClothingHeadHatHairflower: 1
ClothingHeadHatGladiator: 1
ClothingUniformJumpsuitGladiator: 1
ClothingHeadHatCowboyBrown: 1
ClothingHeadHatCowboyBlack: 1
ClothingHeadHatCowboyWhite: 1
ClothingHeadHatCowboyGrey: 1
ClothingShoesBootsCowboyBrown: 1
ClothingShoesBootsCowboyBlack: 1
ClothingShoesBootsCowboyWhite: 1
ClothingEyesBlindfold: 3
ClothingHeadRastaHat: 4
ClothingUniformJumpsuitDameDane: 3
ClothingShoesDameDane: 3
ClothingOuterDameDane: 3
ClothingOuterClownPriest: 2
ClothingMaskSadMime: 3
ClothingMaskScaredMime: 3
ClothingUniformJumpsuitKimono: 3
ClothingHeadHatCasa: 3
ClothingHeadHatHairflower: 5
ClothingHeadHatGladiator: 4
ClothingUniformJumpsuitGladiator: 4
ClothingHeadHatCowboyBrown: 2
ClothingHeadHatCowboyBlack: 2
ClothingHeadHatCowboyWhite: 2
ClothingHeadHatCowboyGrey: 2
ClothingShoesBootsCowboyBrown: 2
ClothingShoesBootsCowboyBlack: 2
ClothingShoesBootsCowboyWhite: 2
emaggedInventory:
ClothingShoesBling: 1
ClothingShoesBootsCowboyFancy: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1828,6 +1828,8 @@
reagents:
- ReagentId: Tea
Quantity: 100
- type: Item
size: Normal
- type: Sprite
sprite: Objects/Consumable/Drinks/teapot.rsi

Expand Down Expand Up @@ -2220,4 +2222,4 @@
- ReagentId: Blood
Quantity: 30
- type: Sprite
sprite: Objects/Consumable/Drinks/bloodglass.rsi
sprite: Objects/Consumable/Drinks/bloodglass.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@
drink:
maxVol: 90
- type: Sprite
sprite: Objects/Consumable/Drinks/vacuumflask.rsi
sprite: Objects/Consumable/Drinks/vacuumflask.rsi
Loading