Merge branch 'master' into chronolegioneer

Space-Stories · Jul 23, 2024 · 7b6054a · 7b6054a
2 parents 17fb849 + 80523a9
commit 7b6054a
Show file tree

Hide file tree

Showing 65 changed files with 1,194 additions and 2,309 deletions.
diff --git a/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl b/Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl
diff --git a/Resources/Locale/ru-RU/materials/materials.ftl b/Resources/Locale/ru-RU/materials/materials.ftl
@@ -24,7 +24,6 @@ materials-web = шёлк
 materials-bones = кости
 materials-coal = уголь
 materials-gunpowder = чёрный порох
-materials-inks = чернила
 # Ores
 materials-raw-iron = руда железа
 materials-raw-quartz = руда кварца

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/catalog/fills/crates/service.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/catalog/fills/crates/service.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/catalog/fills/paper/document.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/catalog/fills/paper/document.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/catalog/fills/paper/printer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/catalog/fills/paper/printer.ftl
diff --git a/.../ss14-ru/prototypes/stories/entities/objects/devices/circuitboards/machine/production.ftl b/.../ss14-ru/prototypes/stories/entities/objects/devices/circuitboards/machine/production.ftl
diff --git a/...urces/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/materials/sheets/other.ftl b/...urces/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/materials/sheets/other.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/misc/flatpacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/misc/flatpacks.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/misc/paper.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/misc/paper.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/structures/machines/printer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/structures/machines/printer.ftl
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -20,7 +20,6 @@
       - id: RubberStampApproved
       - id: ClothingHeadsetAltCargo
       - id: BoxEncryptionKeyCargo
-      - id: BoxPrinter # Stories
 
 - type: entity
   id: LockerCaptainFilledHardsuit
@@ -138,7 +137,6 @@
         prob: 0.5
       - id: ClothingOuterCoatHOP # Corvax-Resprite
       - id: AccessConfigurator
-      - id: BoxPrinter # Stories
 
 - type: entity
   id: LockerChiefEngineerFilledHardsuit

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -14,5 +14,4 @@
     ClothingUniformJumpskirtLibrarian: 3
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
-    BoxPrinter: 1 #Stories
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
@@ -15,7 +15,6 @@
     ClothingNeckScarfStripedSyndieGreen: 2
     ClothingNeckScarfStripedSyndieRed: 2
     ClothingShoesBootsWinterSyndicate: 2
-    BoxSyndiePrinter: 1
 
   emaggedInventory:
     ClothingOuterCoatSyndieCapArmored: 1

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -71,10 +71,6 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 1
-  - type: Material
-  - type: PhysicalComposition
-    materialComposition:
-      SheetPrinter: 100
 
 - type: entity
   name: paper scrap

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -430,7 +430,6 @@
     - BoozeDispenserMachineCircuitboard
     - SodaDispenserMachineCircuitboard
     - SpaceHeaterMachineCircuitBoard
-    - PrinterDocMachineCircuitboard # Corvax-Printer
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard

diff --git a/Resources/Prototypes/Stories/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Stories/Catalog/Cargo/cargo_service.yml
diff --git a/Resources/Prototypes/Stories/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Stories/Catalog/Fills/Crates/service.yml