Merge branch 'master' of https://github.com/AdventureSpaceTeam/advent…

…ure_space_nova
AdventureSpaceTeam · Oct 4, 2024 · 93319ca · 93319ca
2 parents d68931b + 5850372
commit 93319ca
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 12 deletions.
diff --git a/Resources/Prototypes/Adventure/Maps/adventure_delta.yml b/Resources/Prototypes/Adventure/Maps/adventure_delta.yml
@@ -67,15 +67,3 @@
             JanitorBorg: [ 1, 1 ]
             MedicalBorg: [ 1, 1 ]
             ServiceBorg: [ 1, 1 ]
-        - type: StationGoal
-          goals:
-          - Shuttle
-          - Singularity
-          - SolarPanels
-          - Artifacts
-          - Bank
-          - Zoo
-          - MiningOutpost
-          - Tesla
-          - XenobiologyRepair
-          - VirusologyAmbusol
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Corvax/Entities/Objects/Materials/Sheets/other.yml
@@ -0,0 +1,39 @@
+- 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"]
+# NOTE(c4llv07e): commented paper fix, expecting it to be working in upstream
+#    - state: paper_words
+#      map: ["enum.PaperVisualLayers.Writing"]
+#      visible: false
+#    - state: paper_stamp-generic
+#      map: ["enum.PaperVisualLayers.Stamp"]
+#      visible: false
+  - type: Tag
+    tags:
+    - Document
+
+- type: entity
+  parent: SheetPrinter
+  id: SheetPrinter1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
diff --git a/Resources/Prototypes/Corvax/Reagents/Materials/materials.yml b/Resources/Prototypes/Corvax/Reagents/Materials/materials.yml
@@ -0,0 +1,8 @@
+- type: material
+  id: SheetPrinter
+  stackEntity: SheetPrinter1
+  name: materials-paper
+  icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper }
+  color: "#ffffff"
+  price: 0.05
+
diff --git a/Resources/Prototypes/Corvax/Stack/other_stacks.yml b/Resources/Prototypes/Corvax/Stack/other_stacks.yml
@@ -0,0 +1,6 @@
+- 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
@@ -72,6 +72,12 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 1
+# Corvax-Printer-Start
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      SheetPrinter: 100
+# Corvax-Printer-End
 
 - type: entity
   name: paper scrap