Cardboard box, weight changes, bureaucracy crate (#5903)

Co-authored-by: fishfish458 <fishfish458>
2021-12-30 20:28:38 -06:00
parent 27b216bdd7
commit 2aad04ccb9
13 changed files with 99 additions and 69 deletions
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -45,3 +45,15 @@
  cost: 1000
  category: Service
  group: market
+
+- type: cargoProduct
+  name: "bureaucracy crate"
+  id: ServiceBureaucracy
+  description: "Several stacks of paper and a few pens, what more can you ask for."
+  icon:
+    sprite: Objects/Misc/bureaucracy.rsi
+    state: pen
+  product: CrateServiceBureaucracy
+  cost: 1000
+  category: Service
+  group: market
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -1,6 +1,21 @@
+- type: entity
+  name: cardboard box
+  parent: BoxBase
+  id: BoxCardboard
+  description: A cardboard box for storing things.
+  components:
+  - type: Sprite
+    layers:
+      - state: box
+  - type: Item
+    size: 20
+  - type: Storage
+    capacity: 20
+    size: 20
+
 - type: entity
  name: lightbulb box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxLightbulb
  description: This box is shaped on the inside so that only light tubes and bulbs fit.
  components:
@@ -12,11 +27,15 @@
    layers:
      - state: box
      - state: light
-  - type: Item
+  - type: Storage
+    capacity: 60
+    whitelist:
+      components:
+      - LightBulb

 - type: entity
  name: lighttube box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxLighttube
  description: This box is shaped on the inside so that only light tubes and bulbs fit.
  components:
@@ -28,11 +47,15 @@
    layers:
      - state: box
      - state: lighttube
-  - type: Item
+  - type: Storage
+    capacity: 60
+    whitelist:
+      components:
+      - LightBulb

 - type: entity
  name: mixed lights box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxLightMixed
  description: This box is shaped on the inside so that only light tubes and bulbs fit.
  components:
@@ -46,29 +69,35 @@
    layers:
      - state: box
      - state: lightmixed
-  - type: Item
+  - type: Storage
+    capacity: 60
+    whitelist:
+      components:
+      - LightBulb

 - type: entity
  name: pda box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxPDA
  description: A box of spare PDA microcomputers.
  components:
  - type: StorageFill
    contents:
      - id: AssistantPDA
-        amount: 3
+        amount: 6
  - type: Sprite
    layers:
      - state: box
      - state: pda
-  - type: Item
  - type: Storage
-    capacity: 30
+    capacity: 60
+    whitelist:
+      components:
+      - PDA

 - type: entity
  name: meson box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxMesonScanners
  description: A box of spare meson goggles.
  components:
@@ -80,13 +109,10 @@
    layers:
      - state: box
      - state: meson
-  - type: Item
-  - type: Storage
-    capacity: 20

 - type: entity
  name: survival box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxSurvival
  description: It's box with basic internals inside.
  components:
@@ -101,15 +127,13 @@
    layers:
      - state: box
      - state: writing
-  - type: Item
-    size: 20
  - type: Storage
    capacity: 30
    size: 30

 - type: entity
  name: box of hugs
-  parent: BoxSurvival
+  parent: BoxCardboard
  id: BoxHug
  description: A special box for sensitive people.
  components:
@@ -119,3 +143,10 @@
      - state: heart
  - type: Item
    HeldPrefix: hug
+  - type: StorageFill
+    contents:
+      - id: Brutepack
+        amount: 6
+  - type: Storage
+    capacity: 30
+    size: 30
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -1,6 +1,6 @@
 - type: entity
  name: syringe box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxSyringe
  description: A box full of syringes.
  components:
@@ -12,14 +12,14 @@
    layers:
      - state: box
      - state: syringe
-
  - type: Item
+    size: 30
  - type: Storage
    capacity: 30
-    
+
 - type: entity
  name: pill canister box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxPillCanister
  description: A box full of pill canisters.
  components:
@@ -31,14 +31,14 @@
    layers:
      - state: box
      - state: pillbox
-
  - type: Item
+    size: 30
  - type: Storage
    capacity: 30

 - type: entity
  name: sterile box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxSterile
  description: This box contains sterile medical masks.
  components:
@@ -51,13 +51,9 @@
      - state: box
      - state: sterile

-  - type: Item
-  - type: Storage
-    capacity: 20
-
 - type: entity
  name: latex box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxLatex
  description: Contains sterile latex gloves.
  components:
@@ -69,7 +65,3 @@
    layers:
      - state: box
      - state: latex
-
-  - type: Item
-  - type: Storage
-    capacity: 20
--- a/Resources/Prototypes/Catalog/Fills/Boxes/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml
@@ -1,6 +1,6 @@
 - type: entity
  name: beaker box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxBeaker
  description: A box full of beakers.
  components:
@@ -14,7 +14,7 @@
    layers:
      - state: box
      - state: beaker
-
  - type: Item
+    size: 30
  - type: Storage
    capacity: 30
--- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml
@@ -1,6 +1,6 @@
 - type: entity
  name: handcuff box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxHandcuff
  description: A box full of handcuffs.
  components:
@@ -13,13 +13,9 @@
      - state: box_security
      - state: handcuff

-  - type: Item
-  - type: Storage
-    capacity: 20
-
 - type: entity
  name: flashbang box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxFlashbang
  description: 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.'
  components:
@@ -32,13 +28,9 @@
      - state: box_security
      - state: flashbang

-  - type: Item
-  - type: Storage
-    capacity: 20
-
 - type: entity
  name: sechud box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxSechud
  description: A box of security glasses.
  components:
@@ -51,13 +43,9 @@
      - state: box_security
      - state: sechud

-  - type: Item
-  - type: Storage
-    capacity: 20
-
 - type: entity
  name: ziptie box
-  parent: BoxBase
+  parent: BoxCardboard
  id: BoxZiptie
  description: A box full of zipties.
  components:
@@ -69,7 +57,3 @@
    layers:
      - state: box_security
      - state: ziptie
-
-  - type: Item
-  - type: Storage
-    capacity: 20
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -74,3 +74,16 @@
    - id: GroundTobacco
      amount: 4
    - id: Matchbox
+
+- type: entity
+  id: CrateServiceBureaucracy
+  name: bureaucracy crate
+  description: Several stacks of paper and a few pens, what more can you ask for.
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+    - id: Paper
+      amount: 15
+    - id: Pen
+      amount: 2
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -19,7 +19,7 @@
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
    HeldPrefix: packet
-
+    size: 3
 # Snacks

 # "Snacks" means food in a packet. Down the line this stuff can have multiple
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: CigCartonGreen
-  parent: BoxBase
+  parent: BoxCardboard
  name: Spessman's Smokes carton
  description: "A carton containing 6 packets of Spessman's Smokes."
  components:
@@ -12,6 +12,7 @@
    capacity: 36
  - type: Item
    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
+    size: 36
  - type: StorageFill
    contents:
      - id: CigPackGreen
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -206,7 +206,7 @@
    - CrayonPurple

 - type: entity
-  parent: BaseItem
+  parent: BoxCardboard
  id: CrayonBox
  name: crayon box
  description: "It's a box of crayons."
@@ -219,7 +219,7 @@
    capacity: 7
  - type: Item
    sprite: Objects/Fun/crayons.rsi
-    size: 9999
+    size: 7
    HeldPrefix: box
  - type: StorageFill
    contents:
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: BoxCardboard
  name: monkey cube box
  id: MonkeyCubeBox
  description: Drymate brand monkey cubes. Just add water!
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -23,6 +23,8 @@
          # This default isn't actually explicitly used right now.
          enum.PaperStatus.Blank: paper
          enum.PaperStatus.Written: paper_words
+  - type: Item
+    size: 1

 - type: entity
  parent: Paper
@@ -62,3 +64,4 @@
  - type: Item
    sprite: Objects/Misc/bureaucracy.rsi
    HeldPrefix: pen
+    size: 2
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
@@ -8,6 +8,7 @@
    state: icon-3
  - type: Item
    sprite: Objects/Specific/Janitorial/trashbag.rsi
+    size: 125
  - type: Storage
    capacity: 125
    quickInsert: true
@@ -18,20 +19,12 @@
 - type: entity
  name: trash bag
  id: TrashBagBlue
-  parent: BaseItem
+  parent: TrashBag
  components:
  - type: Sprite
-    sprite: Objects/Specific/Janitorial/trashbag.rsi
    state: blue-icon-3
  - type: Item
-    sprite: Objects/Specific/Janitorial/trashbag.rsi
    HeldPrefix: blue
-  - type: Storage
-    capacity: 125
-    quickInsert: true
-    areaInsert: true
-    storageSoundCollection:
-      collection: trashBagRustle

 - type: entity
  name: spell of all-consuming cleanliness
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -312,6 +312,7 @@
      - ServiceSmokeables
      - ServiceCustomSmokable
      - SalvageEquipment
+      - ServiceBureaucracy
      - EngineeringCableLv
      - EngineeringCableMv
      - EngineeringCableHv