diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl index 505220730fe7..8a10cd667fb4 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl @@ -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. diff --git a/Resources/Locale/uk-UA/materials/materials.ftl b/Resources/Locale/uk-UA/materials/materials.ftl index f03961a54743..81c009633054 100644 --- a/Resources/Locale/uk-UA/materials/materials.ftl +++ b/Resources/Locale/uk-UA/materials/materials.ftl @@ -9,6 +9,8 @@ materials-steel = сталь materials-gold = золото materials-silver = срібло materials-plasteel = пласталь +materials-plastitanium = пластитаніум +materials-plamirum = пламірум # Other materials-biomass = біомаса diff --git a/Resources/Locale/uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl b/Resources/Locale/uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl index 505220730fe7..aabb668b2f0d 100644 --- a/Resources/Locale/uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl +++ b/Resources/Locale/uk-UA/prototypes/catalog/fills/crates/materials-crates.ftl @@ -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. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 947a08abb1be..52216ad567e8 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -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: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml index 735e8c25f7cf..2cc8b3450dcc 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index 69b7f83ddb53..0f35e6d25501 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 320f0069f66a..8b0d99f7d578 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -868,6 +868,9 @@ canEjectStoredMaterials: false staticRecipes: - SheetSteel30 + - SheetPlasteel30 + - SheetPlastitanium30 + - SheetPlamirum30 - SheetGlass30 - SheetRGlass30 - SheetPlasma30 diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml index affeb9427eee..6808f2ecb809 100644 --- a/Resources/Prototypes/Reagents/Materials/metals.yml +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index cbfc0ca4527f..d462357ab0e2 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -139,3 +139,56 @@ completetime: 6.4 materials: Meaterial: 200 + +- type: latheRecipe + id: SheetPlasteel + 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 \ No newline at end of file diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml index d56ef4165aa0..83ab6a80d296 100644 --- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml b/Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml index 11970087e7ea..5968102fabad 100644 --- a/Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml +++ b/Resources/Prototypes/_Nyano/Recipes/Lathes/materials.yml @@ -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 diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json index 920eb637311e..18ba6dfe95bc 100644 --- a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json @@ -91,6 +91,150 @@ { "name": "titanium-inhand-right", "directions": 4 + }, + { + "name": "plamirum", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "plamirum_2", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "plamirum_3", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "plamirum_unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "plamirum_2_unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "plamirum_3_unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum.png new file mode 100644 index 000000000000..c27d67142757 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2.png new file mode 100644 index 000000000000..02fb64d389e9 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2_unshaded.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2_unshaded.png new file mode 100644 index 000000000000..29e9659d26b7 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_2_unshaded.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3.png new file mode 100644 index 000000000000..0563ab6b1ab1 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3_unshaded.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3_unshaded.png new file mode 100644 index 000000000000..f54fa7cd6b2b Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_3_unshaded.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_unshaded.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_unshaded.png new file mode 100644 index 000000000000..30c768eedce9 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plamirum_unshaded.png differ