From a08d4a11fa1c84f18dc717491e1f836f7a7fddef Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:39:39 +0100 Subject: [PATCH 1/2] apply review --- .../Prototypes/Corvax/Catalog/Fills/Paper/document.yml | 4 ++-- .../Prototypes/Corvax/Entities/Objects/Misc/flatpacks.yml | 8 ++++++++ .../Corvax/Entities/Structures/Machines/printer.yml | 6 +++--- Resources/Prototypes/Corvax/Stack/other_stacks.yml | 4 ++-- Resources/migration.yml | 3 --- 5 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Misc/flatpacks.yml diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Paper/document.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Paper/document.yml index 6aeee413cda..95df78ca9db 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Paper/document.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Paper/document.yml @@ -354,7 +354,7 @@ - type: entity parent: PrintedDocument id: PrintedDocumentDeathCertificate - name: + name: Death certificate components: - type: Paper content: doc-text-printer-DeathCertificate @@ -429,4 +429,4 @@ name: REPORT ACCOMPLISHMENT GOALS components: - type: Paper - content: doc-text-printer-REPORTACCOMPLISHMENTGOALS \ No newline at end of file + content: doc-text-printer-REPORTACCOMPLISHMENTGOALS diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/flatpacks.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/flatpacks.yml new file mode 100644 index 00000000000..d6743239a75 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/flatpacks.yml @@ -0,0 +1,8 @@ +- type: entity + id: BaseFlatpack + id: PrinterDocFlatpack + name: document printer flatpack + description: A flatpack used for constructing a document printer. + components: + - type: Flatpack + entity: PrinterDoc diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml b/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml index fde31eeff78..cfa8a88a768 100644 --- a/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml +++ b/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml @@ -1,8 +1,8 @@ - type: entity parent: BaseLathe id: PrinterDoc - name: принтер документов - description: Бюрократическое совершенство. Хранит базу данных всех документов Nanotrasen, и дает возможность печатать их, пока у вас есть бумага. + name: document printer + description: Bureaucratic perfection. Stores a database of all Nanotrasen documents, and lets you print them as long as you have paper. components: - type: Sprite sprite: Corvax/Structures/Machines/printer.rsi @@ -96,4 +96,4 @@ tags: - Document storage: - SheetPrinter: 0 \ No newline at end of file + SheetPrinter: 0 diff --git a/Resources/Prototypes/Corvax/Stack/other_stacks.yml b/Resources/Prototypes/Corvax/Stack/other_stacks.yml index 6de9a305c27..1e8831bdd7b 100644 --- a/Resources/Prototypes/Corvax/Stack/other_stacks.yml +++ b/Resources/Prototypes/Corvax/Stack/other_stacks.yml @@ -3,5 +3,5 @@ name: paper icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } spawn: SheetPrinter1 - maxCount: 30 - itemSize: 1 \ No newline at end of file + maxCount: 1 + itemSize: 1 diff --git a/Resources/migration.yml b/Resources/migration.yml index d678ce62bb8..69ac7cf7f4f 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -92,9 +92,6 @@ GeneratorUranium: PortableGeneratorSuperPacman GeneratorPlasmaMachineCircuitboard: PortableGeneratorPacmanMachineCircuitboard GeneratorUraniumMachineCircuitboard: PortableGeneratorSuperPacmanMachineCircuitboard -# 2023-10-18 - Corvax -ComputerAlert: PrinterDoc - # 2023-12-10 SpawnPointSeniorResearcher: null SpawnPointSeniorOfficer: null From 1867e4c5e65b10aa0188d002e18f5d4e01b6d293 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:30:28 +0100 Subject: [PATCH 2/2] 2 --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 ++ .../Catalog/VendingMachines/Inventories/curadrobe.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 4c97e8ecce1..20e65268ce3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -17,6 +17,7 @@ - id: RubberStampQm - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo + - id: PrinterDocFlatpack # Corvax-Printer - type: entity id: LockerCaptainFilledHardsuit @@ -103,6 +104,7 @@ prob: 0.5 - id: ClothingOuterCoatHOP # Corvax-Resprite - id: AccessConfigurator + - id: PrinterDocFlatpack # Corvax-Printer - type: entity id: LockerChiefEngineerFilledHardsuit diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml index b083c62ed56..24176881bc2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml @@ -11,4 +11,4 @@ ClothingUniformJumpskirtLibrarian: 3 ClothingShoesBootsLaceup: 2 ClothingHeadsetService: 2 - + PrinterDocFlatpack: 2 # Corvax-Printer