Add cardboard material (#14701)

* add cardboard material

* missing stack visualizers

* add crafting recipes

* cardboard crate

* license thing

* rename various things

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 46a31311350619d77ee8ae4e552633ec15836784..802b71eda9b883bbcd49635316469438ed993430 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-materials.ftl
@@ -16,6 +16,9 @@ ent-MaterialPlasteel = { ent-CrateMaterialPlasteel }
 ent-MaterialPlasma = { ent-CrateMaterialPlasma }
     .desc = { ent-CrateMaterialPlasma.desc }
 
+ent-CardboardMaterial = { ent-CrateMaterialCardboard }
+    .desc = { ent-CrateMaterialCardboard.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 2477e9a532a6a5701ee54b9c7ad9a7b7d5218b87..505220730fe7d29a92f83a5194282bc426a060dd 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/materials-crates.ftl
@@ -18,3 +18,6 @@ ent-CrateMaterialPlasteel = Plasteel crate
 
 ent-CrateMaterialPlasma = Solid plasma crate
     .desc = 90 sheets of plasma.
+
+ent-CrateMaterialCardboard = Cardboard crate
+    .desc = 60 pieces of cardboard.

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
index 36953b3abc236ffe5fd861c3dced650a047d391a..00f6e6a422bd3bc857ff232286b9eafd61cb3819 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -58,6 +58,16 @@
   category: Materials
   group: market
 
+- type: cargoProduct
+  id: CardboardMaterial
+  icon:
+    sprite: Objects/Materials/materials.rsi
+    state: cardboard_3
+  product: CrateMaterialCardboard
+  cost: 750
+  category: Materials
+  group: market
+
 - type: cargoProduct
   id: MaterialFuelTank
   icon:

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index 69aa37df885d9c836d55eebfee6233e19e79d94f..b4cafc8a343ec9032d7b9beee80870aa79e71c9f 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -63,6 +63,15 @@
       - id: SheetPlasma
         amount: 3
 
+- type: entity
+  id: CrateMaterialCardboard
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: MaterialCardboard
+        amount: 2
+
 #- type: entity
 #  id: CrateMaterialHFuelTank
 #  name:  fueltank crate

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index f6f1b9efc7cf9d1ca2eb3c1bbbaa057e7c1576e9..e0956d4cd273a2e576a86c19737c21ce5a2b2ae1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -25,6 +25,37 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
+- type: entity
+  parent: MaterialBase
+  id: MaterialCardboard
+  name: cardboard
+  suffix: Full
+  components:
+  - type: Material
+    materials:
+      Cardboard: 100
+  - type: Stack
+    stackType: Cardboard
+  - type: Sprite
+    state: cardboard_3
+  - type: Appearance
+    visuals:
+    - type: StackVisualizer
+      stackLayers:
+      - cardboard
+      - cardboard_2
+      - cardboard_3
+
+- type: entity
+  parent: MaterialCardboard
+  id: MaterialCardboard1
+  suffix: Single
+  components:
+  - type: Sprite
+    state: cardboard
+  - type: Stack
+    count: 1
+
 - type: entity
   parent: MaterialBase
   id: MaterialCloth

diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml
index 75d0f60e0429bb90b69062e0dbbd5a32289c5f88..5f3e1e6cd962899ac27796e3d9bddbda70aa3501 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -15,3 +15,8 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
+  - type: Construction
+    graph: BoxCardboard
+    node: boxcardboard
+    containers:
+      - entity_storage

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml
index bc7cecab44a4980c7b1e0c650b5ef90b9a353bd0..d3e8247403e2d24969654867f5a2849ed3fc32e0 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml
@@ -50,6 +50,11 @@
       tags:
         - DoorBumpOpener
     - type: InteractionOutline
+    - type: Construction
+      graph: BaseBigBox
+      node: basebigbox
+      containers:
+        - entity_storage
 
 - type: entity
   id: StealthBox

diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index 6c2eea38a801e2060325f3566148b72765e908e6..faaa2523ece7572c452cadcabba7f680c532b761 100644 (file)
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -6,6 +6,14 @@
   color: "#8A9A5B"
   price: 0.1
 
+- type: material
+  id: Cardboard
+  stackEntity: MaterialCardboard1
+  name: materials-cardboard
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
+  color: "#70736c"
+  price: 0.05
+
 - type: material
   id: Cloth
   stackEntity: MaterialCloth1

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/bigbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/bigbox.yml
new file mode 100644 (file)
index 0000000..eef5d5c
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/bigbox.yml
@@ -0,0 +1,15 @@
+- type: constructionGraph
+  id: BaseBigBox
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: basebigbox
+          steps:
+            - material: Cardboard
+              amount: 5
+              doAfter: 5
+
+
+    - node: basebigbox
+      entity: BaseBigBox
\ No newline at end of file

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml
new file mode 100644 (file)
index 0000000..527f6b5
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml
@@ -0,0 +1,15 @@
+- type: constructionGraph
+  id: BoxCardboard
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: boxcardboard
+          steps:
+            - material: Cardboard
+              amount: 1
+              doAfter: 4
+
+
+    - node: boxcardboard
+      entity: BoxCardboard
\ No newline at end of file

diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml
index 23a8e0a8b1e2877daf9c379b8a0738f2bcd21030..a55d6211e701746f128b951971c11d46c77249f4 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/crates.yml
+++ b/Resources/Prototypes/Recipes/Crafting/crates.yml
@@ -30,3 +30,25 @@
   description: A plastic crate for storing things.
   icon: { sprite: Structures/Storage/Crates/plastic.rsi, state: icon }
   objectType: Structure
+
+- type: construction
+  name: cardboard box
+  id: BaseBigBox
+  graph: BaseBigBox
+  startNode: start
+  targetNode: basebigbox
+  category: construction-category-storage
+  description: A big box for storing things or hiding in.
+  icon: { sprite: Structures/Storage/closet.rsi, state: cardboard }
+  objectType: Structure
+
+- type: construction
+  name: cardboard box
+  id: BoxCardboard
+  graph: BoxCardboard
+  startNode: start
+  targetNode: boxcardboard
+  category: construction-category-storage
+  description: A small box for storing things.
+  icon: { sprite: Objects/Storage/boxes.rsi, state: box }
+  objectType: Item
\ No newline at end of file

diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
index f2aad5f56f2f3cacdf05fa1bdf9beea2c3f65c96..253c61b4f5e33f0ea51c95ca94a785a2fbed7368 100644 (file)
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ b/Resources/Prototypes/Stacks/Materials/materials.yml
@@ -12,6 +12,13 @@
   spawn: MaterialWoodPlank1
   maxCount: 30
 
+- type: stack
+  id: Cardboard
+  name: cardboard
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
+  spawn: MaterialCardboard1
+  maxCount: 30
+
 - type: stack
   id: Cloth
   name: cloth

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cardboard.png b/Resources/Textures/Objects/Materials/materials.rsi/cardboard.png
new file mode 100644 (file)
index 0000000..c12334e
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cardboard.png differ

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cardboard_2.png b/Resources/Textures/Objects/Materials/materials.rsi/cardboard_2.png
new file mode 100644 (file)
index 0000000..54f6f9d
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cardboard_2.png differ

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cardboard_3.png b/Resources/Textures/Objects/Materials/materials.rsi/cardboard_3.png
new file mode 100644 (file)
index 0000000..a04bd0f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cardboard_3.png differ

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index c5a4f89be174ccbc1b5d4f5a568fc9007f106111..66174d09241e7a801a61c85fa6095711d23d1826 100644 (file)
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -30,6 +30,15 @@
         ]
       ]
     },
+    {
+      "name": "cardboard"
+    },
+    {
+      "name": "cardboard_2"
+    },
+    {
+      "name": "cardboard_3"
+    },
     {
       "name": "cathide"
     },