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

Новый костюм карго #553

Merged
merged 4 commits into from
Oct 30, 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
@@ -0,0 +1,2 @@
ent-ClothingOuterSuitCargo = грузовой костюм
.desc = Специальный костюм для работников карго, немного напоминающий старый костюм из другой вселенной.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-BluespaceBox = блюспейс коробка
.desc = коробка, использующая блюспейс технологии для умещения любого предмета и увеличения вместимости.
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ research-technology-handcraft-nvd = Кустарные ПНВ
research-technology-basic-nvd = Продвинутое ПНВ
research-technology-combat-equipment = Боевое снаряжение
research-technology-extended-amunitions = Расширенные магазины
research-technology-cargo-bluespace-equipment = Блюспейс экипировка карго
8 changes: 7 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
- id: RubberStampDenied
- id: RubberStampQm
- id: AstroNavCartridge
- id: FlippoLighterSunriseQm # Sunrise-Flippo
# Sunrise-start: Flippos + Cargo suit
- id: ClothingOuterSuitCargo
- id: BluespaceBox
- id: BluespaceBox
prob: 0.25
- id: FlippoLighterSunriseQm
# Sunrise-end

- type: entity
id: LockerQuarterMasterFilled
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,8 @@
- PowerCageMedium
- PowerCageSmall
- ClothingShoesBootsMagCombat
- CargoSuit
- BluespaceBox
# Sunrise-end
- type: EmagLatheRecipes
emagDynamicRecipes:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Recipes/Lathes/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
result: AppraisalTool
completetime: 4
materials:
Steel: 500
Steel: 500
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
- type: entity
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, ClothingOuterStorageBase]
id: ClothingOuterSuitCargo
name: cargo suit
description: A special suit for cargo workers, somewhat reminiscent of an old suit from another universe.
suffix: Sunrise
components:
- type: Storage
grid:
- 0,0,3,3
whitelist:
tags:
- BluespaceBox
- type: Sprite
sprite: _Sunrise/Clothing/OuterClothing/Suits/cargo-suit.rsi
- type: Clothing
sprite: _Sunrise/Clothing/OuterClothing/Suits/cargo-suit.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Heat: 1.2
Slash: 0.8
Piercing: 0.8
Caustic: 0.8
Cold: 0.8
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 1
- type: HeldSpeedModifier
22 changes: 22 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Objects/Misc/box.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
- type: entity
id: BluespaceBox
parent: BoxBase
name: bluespace box
description: A box that uses bluespace technology to fit any item and increase capacity.
components:
- type: Sprite
sprite: _Sunrise/Objects/Storage/boxes.rsi
layers:
- state: icon
- type: Item
sprite: _Sunrise/Objects/Storage/boxes.rsi
size: Normal
shape: null
- type: Storage
maxItemSize: Normal
grid:
- 0,0,4,4
- type: Appearance
- type: Tag
tags:
- BluespaceBox
17 changes: 17 additions & 0 deletions Resources/Prototypes/_Sunrise/Recipes/Lathes/cargo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: latheRecipe
id: CargoSuit
result: ClothingOuterSuitCargo
completetime: 10
materials:
Steel: 2500
Plastic: 1000
Plasma: 500

- type: latheRecipe
id: BluespaceBox
result: BluespaceBox
completetime: 5
materials:
Steel: 500
Plastic: 100
Plasma: 500
13 changes: 13 additions & 0 deletions Resources/Prototypes/_Sunrise/Research/industrial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,19 @@
cost: 2500
recipeUnlocks:
- HandCraftedNVD

- type: technology
id: CargoBluespaceEquipment
name: research-technology-cargo-bluespace-equipment
icon:
sprite: _Sunrise/Clothing/OuterClothing/Suits/cargo-suit.rsi
state: icon
discipline: Industrial
tier: 1
cost: 5000
recipeUnlocks:
- CargoSuit
- BluespaceBox

# Tier 2

Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_Sunrise/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@
- type: Tag
id: MagazineDl6902

- type: Tag
id: BluespaceBox

# Material bag:

- type: Tag
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": "CLA",
"copyright": "SUNRISE",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-reptilian",
"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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions Resources/Textures/_Sunrise/Objects/Storage/boxes.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"version": 1,
"license": "CLA",
"copyright": "SUNRISE",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "inhand",
"directions": 4
}
]
}
Loading