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

Работка по предложениям #108

Merged
merged 20 commits into from
Apr 13, 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
16 changes: 16 additions & 0 deletions Resources/Prototypes/Andromeda/Lemird Prototype's/balaclava.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
parent: ClothingMaskPullableBase
id: ClothingMaskBalaclava
name: балаклава
description: Головной убор закрывающий голову, лоб и лицо, оставляя небольшую прорезь для глаз и рта.
suffix: Андромеда
components:
- type: Sprite
sprite: Andromeda/Lemird/balaclava.rsi
- type: Clothing
sprite: Andromeda/Lemird/balaclava.rsi
- type: IngestionBlocker
- type: IdentityBlocker
- type: Tag
tags:
- WhitelistChameleon
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
- type: entity
name: cалат оливье
parent: FoodBowlBase
id: FoodSaladOlivie
description: Традиционное салатное блюдо в русской кухне.
suffix: Андромеда
components:
- type: FlavorProfile
flavors:
- carrot
- potatoes
- egg
- meaty
- type: Sprite
sprite: Andromeda/NIKforest/olivie.rsi
layers:
- state: bowl
- state: olivie
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5
- type: Tag
tags:
- Fruit
- Soup
- Meat

- type: microwaveMealRecipe
id: RecipeOlivieSalad
name: olivie salad recipe
result: FoodSaladOlivie
time: 5
reagents:
Mayo: 5
Egg: 12
TableSalt: 5
Blackpepper: 5
solids:
FoodBowlBig: 1
FoodPotato: 2
FoodCarrot: 2
FoodMeat: 1
FoodPeaPod: 2
FoodOnionSlice: 1
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
ClothingNeckScarfStripedSyndieGreen: 2
ClothingNeckScarfStripedSyndieRed: 2
ClothingShoesBootsWinterSyndicate: 2
ClothingMaskBalaclava: 2 #A-13 Balaclava

emaggedInventory:
ClothingOuterCoatSyndieCapArmored: 1
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.
18 changes: 18 additions & 0 deletions Resources/Textures/Andromeda/Lemird/balaclava.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By Lemird",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-MASK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions Resources/Textures/Andromeda/NIKforest/olivie.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "bowl"
},
{
"name": "olivie"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading