From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Date: Mon, 6 Nov 2023 02:14:02 +0000 (-0500) Subject: Adds more sources for sheet paper material (#21364) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=196be3cba12ecfd40b2659fad023246374a8d554;p=space-station-14.git Adds more sources for sheet paper material (#21364) * Moves sheetifier research unlock from civilian services to industrial * Makes wood insertable into the sheetifier and makes paper a lathable material * Adds a paper crate to the cargo catalog * Adds localizations --- diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index abd61d1065..d515479a0e 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -18,6 +18,7 @@ materials-durathread = durathread materials-plasma = plasma materials-plastic = plastic materials-wood = wood +materials-paper = paper materials-uranium = uranium materials-bananium = bananium materials-meat = meat diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl index 802b71eda9..88e58b647e 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl @@ -19,6 +19,9 @@ ent-MaterialPlasma = { ent-CrateMaterialPlasma } ent-CardboardMaterial = { ent-CrateMaterialCardboard } .desc = { ent-CrateMaterialCardboard.desc } +ent-PaperMaterial = { ent-CrateMaterialPaper } + .desc = { ent-CrateMaterialPaper.desc } + ent-MaterialFuelTank = { ent-WeldingFuelTankFull } .desc = { ent-WeldingFuelTankFull.desc } 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 505220730f..c204215474 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 @@ -21,3 +21,6 @@ ent-CrateMaterialPlasma = Solid plasma crate ent-CrateMaterialCardboard = Cardboard crate .desc = 60 pieces of cardboard. + +ent-CrateMaterialPaper = Paper crate + .desc = 90 sheets of paper. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 98dc8671de..bebc3fc307 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -68,6 +68,16 @@ category: Materials group: market +- type: cargoProduct + id: PaperMaterial + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: paper_3 + product: CrateMaterialPaper + cost: 1000 + category: Materials + group: market + - type: cargoProduct id: MaterialFuelTank icon: @@ -86,4 +96,4 @@ product: WaterTankFull cost: 1000 category: Materials - group: market \ No newline at end of file + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml index fd49ec339c..dc73a5106a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml @@ -70,6 +70,15 @@ - id: MaterialCardboard amount: 2 +- type: entity + id: CrateMaterialPaper + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: SheetPaper + amount: 3 + #- type: entity # id: CrateMaterialHFuelTank # name: fueltank crate diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index ed1a1e3da0..31fefb681e 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -37,6 +37,10 @@ - paper - paper_2 - paper_3 + - type: Material + - type: PhysicalComposition + materialComposition: + Paper: 100 - type: Sprite state: paper_3 layers: diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 4af2886c24..c74bec6a06 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -223,6 +223,11 @@ - type: Appearance - type: Item heldPrefix: wood + - type: Tag + tags: + - Wooden + - DroneUsable + - RawMaterial - type: entity parent: MaterialWoodPlank diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index fbd19d5fd0..38839d9f9f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -887,9 +887,11 @@ whitelist: tags: - Raw + - Wooden - type: Lathe idleState: base_machine runningState: base_machine_processing canEjectStoredMaterials: false staticRecipes: - MaterialSheetMeat + - SheetPaper diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index e9a0cad37d..a8fc1744b3 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -34,6 +34,14 @@ color: "#8291a1" price: 0.15 # 1-1 mix of plastic and cloth. +- type: material + id: Paper + stackEntity: SheetPaper1 + name: materials-paper + icon: { sprite: Objects/Materials/Sheets/other.rsi, state: paper } + color: "#d9d9d9" + price: 0.05 #same as wood + - type: material id: Plasma stackEntity: SheetPlasma1 @@ -98,4 +106,4 @@ unit: materials-unit-piece icon: { sprite: Objects/Materials/materials.rsi, state: bones } color: "#896f5e" - price: 0 \ No newline at end of file + price: 0 diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index cbfc0ca452..f724b96bc0 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -139,3 +139,10 @@ completetime: 6.4 materials: Meaterial: 200 + +- type: latheRecipe + id: SheetPaper + result: SheetPaper1 + completetime: 1 + materials: + Wood: 50 diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 9208775094..d82090719e 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -157,7 +157,6 @@ cost: 5000 recipeUnlocks: - FatExtractorMachineCircuitboard - - SheetifierMachineCircuitboard - type: technology id: HONKMech diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 58ff346e0e..797ec2b7b7 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -1,4 +1,4 @@ -# Tier 1 +# Tier 1 - type: technology id: SalvageEquipment @@ -54,6 +54,7 @@ - AutolatheMachineCircuitboard - CircuitImprinterMachineCircuitboard - MaterialReclaimerMachineCircuitboard + - SheetifierMachineCircuitboard - type: technology id: PowerGeneration