diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/other.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/other.ftl deleted file mode 100644 index 479c0028672..00000000000 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/other.ftl +++ /dev/null @@ -1,6 +0,0 @@ -ent-SheetPrinter = { ent-Paper } - .suffix = Full - .desc = { ent-Paper.desc } -ent-SheetPrinter1 = { ent-SheetPrinter } - .suffix = Single - .desc = { ent-SheetPrinter.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/other.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/other.ftl deleted file mode 100644 index 4a8cc1fe04a..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/materials/sheets/other.ftl +++ /dev/null @@ -1,6 +0,0 @@ -ent-SheetPrinter = { ent-Paper } - .suffix = Полный - .desc = { ent-Paper.desc } -ent-SheetPrinter1 = { ent-SheetPrinter } - .suffix = Один - .desc = { ent-SheetPrinter.desc } diff --git a/Resources/Maps/corvax_ishimura.yml b/Resources/Maps/corvax_ishimura.yml index 89127735d22..c52527cffe9 100644 --- a/Resources/Maps/corvax_ishimura.yml +++ b/Resources/Maps/corvax_ishimura.yml @@ -1,4 +1,4 @@ -meta: +meta: format: 6 postmapinit: false tilemap: diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Corvax/Entities/Objects/Materials/Sheets/other.yml deleted file mode 100644 index 59cfc943c3d..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Materials/Sheets/other.yml +++ /dev/null @@ -1,32 +0,0 @@ -- type: entity - parent: Paper - id: SheetPrinter - suffix: Full - components: - - type: Material - - type: PhysicalComposition - materialComposition: - SheetPrinter: 100 - - type: Stack - stackType: SheetPrinter - baseLayer: base - layerStates: - - paper - - paper - - paper - - type: Sprite - state: paper - layers: - - state: paper - map: ["base"] - - type: Tag - tags: - - Document - -- type: entity - parent: SheetPrinter - id: SheetPrinter1 - suffix: Single - components: - - type: Stack - count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml b/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml index aa7fb4cc763..87e8e2889a1 100644 --- a/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml +++ b/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml @@ -107,4 +107,4 @@ tags: - Document storage: - SheetPrinter: 0 + Paper: 0 diff --git a/Resources/Prototypes/Corvax/Maps/ishimura.yml b/Resources/Prototypes/Corvax/Maps/ishimura.yml index b008d68fd3f..f9fb3d25dfc 100644 --- a/Resources/Prototypes/Corvax/Maps/ishimura.yml +++ b/Resources/Prototypes/Corvax/Maps/ishimura.yml @@ -1,4 +1,4 @@ -- type: gameMap +- type: gameMap id: CorvaxIshimura mapName: 'USG Ishimura' mapPath: /Maps/corvax_ishimura.yml diff --git a/Resources/Prototypes/Corvax/Reagents/Materials/materials.yml b/Resources/Prototypes/Corvax/Reagents/Materials/materials.yml deleted file mode 100644 index dcbcdd0d3b3..00000000000 --- a/Resources/Prototypes/Corvax/Reagents/Materials/materials.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: material - id: SheetPrinter - stackEntity: SheetPrinter1 - name: materials-paper - icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } - color: "#ffffff" - price: 0.05 - \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/printer.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/printer.yml index 29b5e3a0ba9..6435e414274 100644 --- a/Resources/Prototypes/Corvax/Recipes/Lathes/printer.yml +++ b/Resources/Prototypes/Corvax/Recipes/Lathes/printer.yml @@ -5,7 +5,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentReportOnEliminationOfViolationsRecipe @@ -14,7 +14,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentReporDepartmentRecipe @@ -23,7 +23,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentReportEmployeePerformanceRecipe @@ -32,7 +32,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentReportOnTheChaptersMeetingRecipe @@ -41,7 +41,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentInternalAffairsAgentsReportRecipe @@ -50,7 +50,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentConditionReportRecipe @@ -59,7 +59,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentReportStudyObjectRecipe @@ -68,7 +68,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentExperimentReportRecipe @@ -77,7 +77,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentDisposalReportRecipe @@ -86,7 +86,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentApplicationAppointmentInterimRecipe @@ -95,7 +95,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentApplicationEmploymentRecipe @@ -104,7 +104,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentLetterResignationRecipe @@ -113,7 +113,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentApplicationAccessRecipe @@ -122,7 +122,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentApplicationEquipmentRecipe @@ -131,7 +131,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentAppealRecipe @@ -140,7 +140,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentEvacuationShuttleRequestRecipe @@ -149,7 +149,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentShuttleRegistrationRequestRecipe @@ -158,7 +158,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestCallMembersCentralCommitteeDSORecipe @@ -167,7 +167,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestRequestToEstablishThreatLevelRecipe @@ -176,7 +176,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestChangeSalaryRecipe @@ -185,7 +185,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestForNonlistedEmploymentRecipe @@ -194,7 +194,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestForPromotionRecipe @@ -203,7 +203,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestDocumentsRecipe @@ -212,7 +212,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestEuthanasiaRecipe @@ -221,7 +221,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestConstructionWorkRecipe @@ -230,7 +230,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentRequestModernizationRecipe @@ -239,7 +239,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentComplaintViolationLaborRulesRecipe @@ -248,7 +248,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentComplaintOffenseRecipe @@ -257,7 +257,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentPermissionEquipmentRecipe @@ -266,7 +266,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentPermissionToTravelInCaseOfThreatRecipe @@ -275,7 +275,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentSearchPermissionRecipe @@ -284,7 +284,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentPermissionToCarryWeaponsRecipe @@ -293,7 +293,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentPrescriptionDrugAuthorizationRecipe @@ -302,7 +302,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentPermissionDisposeBodyRecipe @@ -311,7 +311,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentConstructionPermitRecipe @@ -320,7 +320,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentPermissionToExtendMarriageRecipe @@ -329,7 +329,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderDismissalRecipe @@ -338,7 +338,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderDeprivationAccessRecipe @@ -347,7 +347,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderEncouragementRecipe @@ -356,7 +356,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderParolePrisonerRecipe @@ -365,7 +365,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderRecognizingSentienceCreatureRecipe @@ -374,7 +374,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderMedicalInterventionRecipe @@ -383,7 +383,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentProductManufacturingOrderRecipe @@ -392,7 +392,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderPurchaseResourcesEquipmentRecipe @@ -401,7 +401,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderingSpecialEquipmentRecipe @@ -410,7 +410,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentOrderPurchaseWeaponsRecipe @@ -419,7 +419,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentCertificateRecipe @@ -428,7 +428,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentCertificateAdvancedTrainingRecipe @@ -437,7 +437,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentCertificateOffenseRecipe @@ -446,7 +446,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentDeathCertificateRecipe @@ -455,7 +455,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentMarriageCertificateRecipe @@ -464,7 +464,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentDivorceCertificateRecipe @@ -473,7 +473,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentClosingIndictmentRecipe @@ -482,7 +482,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentSentenceRecipe @@ -491,7 +491,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentJudgmentRecipe @@ -500,7 +500,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentStatementHealtheRecipe @@ -509,7 +509,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentDecisionToStartTrialRecipe @@ -518,7 +518,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentErrorLoadingFormHeaderRecipe @@ -527,7 +527,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentNoticeOfLiquidationRecipe @@ -536,7 +536,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentBusinessDealRecipe @@ -545,7 +545,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentNoteBeginningMilitaryActionsRecipe @@ -554,7 +554,7 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 - type: latheRecipe id: PrintedDocumentReportAccomplishmentGoalsRecipe @@ -563,4 +563,4 @@ completetime: 2 applyMaterialDiscount: false materials: - SheetPrinter: 100 + Paper: 100 diff --git a/Resources/Prototypes/Corvax/Stack/other_stacks.yml b/Resources/Prototypes/Corvax/Stack/other_stacks.yml deleted file mode 100644 index f87e383ee0c..00000000000 --- a/Resources/Prototypes/Corvax/Stack/other_stacks.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: stack - id: SheetPrinter - name: paper - icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } - spawn: SheetPrinter1 - maxCount: 1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index f8a34352721..8d6729b153f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -75,7 +75,7 @@ - type: Material - type: PhysicalComposition materialComposition: - SheetPrinter: 100 + Paper: 100 # Corvax-Printer-End - type: entity diff --git a/Resources/migration.yml b/Resources/migration.yml index 0919385c85e..1e89eb8ee3d 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -447,3 +447,7 @@ BlueprintFlare: null # 2024-10-04 BaseAdvancedPen: Pen + +# 2024-10-05 - Corvax +SheetPrinter: SheetPaper +SheetPrinter1: SheetPaper1