Skip to content
Draft
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 @@ -16,6 +16,9 @@ ent-CrateMaterialWood = Wood crate
ent-CrateMaterialPlasteel = Plasteel crate
.desc = 90 sheets of plasteel.

ent-CrateMaterialPlasteel = Plastitanium crate
.desc = 90 sheets of plastitanium.

ent-CrateMaterialPlasma = Solid plasma crate
.desc = 90 sheets of plasma.

Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/uk-UA/materials/materials.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ materials-steel = сталь
materials-gold = золото
materials-silver = срібло
materials-plasteel = пласталь
materials-plastitanium = пластитаніум
materials-plamirum = пламірум

# Other
materials-biomass = біомаса
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ ent-CrateMaterialWood = Wood crate
ent-CrateMaterialPlasteel = Plasteel crate
.desc = 90 sheets of plasteel.

ent-CrateMaterialPlasteel = Plastitanium crate
.desc = 90 sheets of plastitanium.

ent-CrateMaterialPlasma = Solid plasma crate
.desc = 90 sheets of plasma.

Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@
category: Materials
group: market

- type: cargoProduct
id: MaterialPlastitanium
icon:
sprite: Objects/Materials/Sheets/metal.rsi
state: plastitanium_3
product: CrateMaterialPlastitanium
cost: 16000 # TODO: Lower the cost back when possible
category: Materials
group: market

- type: cargoProduct
id: MaterialTextiles
icon:
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/materials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@
- id: SheetPlasteel
amount: 3

- type: entity
id: CrateMaterialPlastitanium
parent: CrateGenericSteel
components:
- type: StorageFill
contents:
- id: SheetPlastitanium
amount: 3

- type: entity
id: CrateMaterialPlasma
parent: CratePlasma
Expand Down
120 changes: 120 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,123 @@
count: 1
- type: Item
size: 1

- type: entity
parent: SheetMetalBase
id: SheetPlastitanium
name: plastitanium
suffix: Full
components:
- type: Material
- type: PhysicalComposition
materialComposition:
Plastitanium: 100
- type: Stack
stackType: Plastitanium
baseLayer: base
layerStates:
- plastitanium
- plastitanium_2
- plastitanium_3
- type: Sprite
state: plastitanium_3
layers:
- state: plastitanium_3
map: ["base"]
- type: Item
heldPrefix: plastitanium
- type: Appearance

- type: entity
parent: SheetPlastitanium
id: SheetPlastitanium10
name: plastitanium
suffix: 10
components:
- type: Sprite
state: plastitanium
- type: Stack
stackType: Plastitanium
count: 10
- type: Item
size: 10

- type: entity
parent: SheetPlastitanium
id: SheetPlastitanium1
name: plastitanium
suffix: Single
components:
- type: Sprite
state: plastitanium
- type: Stack
stackType: Plastitanium
count: 1
- type: Item
size: 1

- type: entity
parent: SheetMetalBase
id: SheetPlamirum
name: plamirum
suffix: Full
components:
- type: Material
- type: PhysicalComposition
materialComposition:
Plamirum: 100
- type: Stack
stackType: Plamirum
baseLayer: base
layerStates:
- plamirum
- plamirum_2
- plamirum_3
- type: Sprite
state: plamirum_3
layers:
- state: plamirum_3
map: ["base"]
- state: plamirum_3_unshaded
shader: unshaded
- type: Item
heldPrefix: plamirum
- type: Appearance

- type: entity
parent: SheetPlamirum
id: SheetPlamirum10
name: plamirum
suffix: 10
components:
- type: Sprite
state: plamirum_2
layers:
- state: plamirum_2
map: ["base"]
- state: plamirum_2_unshaded
shader: unshaded
- type: Stack
stackType: Plamirum
count: 10
- type: Item
size: 10

- type: entity
parent: SheetPlamirum
id: SheetPlamirum1
name: plamirum
suffix: Single
components:
- type: Sprite
state: plamirum
layers:
- state: plamirum
map: ["base"]
- state: plamirum_unshaded
shader: unshaded
- type: Stack
stackType: Plamirum
count: 1
- type: Item
size: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -868,6 +868,9 @@
canEjectStoredMaterials: false
staticRecipes:
- SheetSteel30
- SheetPlasteel30
- SheetPlastitanium30
- SheetPlamirum30
- SheetGlass30
- SheetRGlass30
- SheetPlasma30
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Reagents/Materials/metals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,19 @@
icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel }
color: "#696969" #Okay, this is epic
price: 0.28 # 1-1 mix of plasma and steel.

- type: material
id: Plastitanium
stackEntity: SheetPlastitanium1
name: materials-plastitanium
icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plastitanium }
color: "#696969"
price: 0.50

- type: material
id: Plamirum
stackEntity: SheetPlamirum1
name: materials-plamirum
icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plamirum }
color: "#6bdce2"
price: 0.98
53 changes: 53 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/sheet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,56 @@
completetime: 6.4
materials:
Meaterial: 200

- type: latheRecipe
id: SheetPlasteel

Choose a reason for hiding this comment

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

скоріш за все лінтер ругається на оце, бо схоже вже є такий рецепт у:

result: SheetPlasteel1
applyMaterialDiscount: false
completetime: 2
materials:
Steel: 100
Plasma: 100

- type: latheRecipe
id: SheetPlasteel30
result: SheetPlasteel
completetime: 2
materials:
Steel: 3000
Plasma: 3000

- type: latheRecipe
id: SheetPlastitanium
result: SheetPlastitanium1
applyMaterialDiscount: false
completetime: 2
materials:
Steel: 150
Uranium: 100

- type: latheRecipe
id: SheetPlastitanium30
result: SheetPlastitanium
completetime: 2
materials:
Steel: 4500
Uranium: 3000

- type: latheRecipe
id: SheetPlamirum
result: SheetPlamirum1
applyMaterialDiscount: false
completetime: 2
materials:
Steel: 200
Plasma: 200
Uranium: 200

- type: latheRecipe
id: SheetPlamirum30
result: SheetPlamirum
completetime: 2
materials:
Steel: 60000
Plasma: 60000
Uranium: 60000
16 changes: 16 additions & 0 deletions Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,19 @@
spawn: SheetPlasteel1
maxCount: 30
itemSize: 1

- type: stack
id: Plastitanium
name: пластитаніум
icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plastitanium }
spawn: SheetPlastitanium1
maxCount: 30
itemSize: 1

- type: stack
id: Plamirum
name: пламірум
icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plamirum}
spawn: SheetPlamirum1
maxCount: 30
itemSize: 1
12 changes: 12 additions & 0 deletions Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,15 @@
materials:
Steel: 100
Plasma: 100

- type: latheRecipe
id: SheetPlastitanium
icon:
sprite: Objects/Materials/Sheets/metal.rsi
state: plastitanium
result: SheetPlastitanium1
applyMaterialDiscount: false
completetime: 2
materials:
Steel: 150
Uranium: 100
Loading