Merge branch 'master' into replace-sounds-with-sound-specifier

# Conflicts: # Content.Server/Kitchen/Components/ReagentGrinderComponent.cs # Content.Server/Storage/Components/SecureEntityStorageComponent.cs
2021-07-30 20:26:22 +02:00
parent f531c65a0b 898bdc9491
commit 5363f59a90
117 changed files with 1807 additions and 1851 deletions
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -8,6 +8,8 @@
    sprite: Clothing/OuterClothing/Coats/bomber.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/bomber.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -19,6 +21,8 @@
    sprite: Clothing/OuterClothing/Coats/detective.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/detective.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -30,6 +34,8 @@
    sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -41,6 +47,8 @@
    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -52,6 +60,8 @@
    sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -63,6 +73,8 @@
    sprite: Clothing/OuterClothing/Coats/jensencoat.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/jensencoat.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -74,6 +86,8 @@
    sprite: Clothing/OuterClothing/Coats/labcoat.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/labcoat.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -85,6 +99,8 @@
    sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -96,6 +112,8 @@
    sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
+  - type: Storage
+    capacity: 10

 - type: entity
  parent: ClothingOuterBase
@@ -107,3 +125,5 @@
    sprite: Clothing/OuterClothing/Coats/pirate.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/pirate.rsi
+  - type: Storage
+    capacity: 10
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -1,8 +1,5 @@
 # Base

- type: Tag
-  id: Donut
-
 - type: entity
  parent: BaseItem
  id: FoodDonutBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -21,6 +21,9 @@
    count: 8
  - type: Item
    size: 8
+  - type: Tag
+    tags:
+    - Pizza

 - type: entity
  parent: FoodPizzaBase
@@ -37,6 +40,9 @@
        Quantity: 5
  - type: Item
    size: 1
+  - type: Tag
+    tags:
+    - Pizza

 # Pizza

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -8,7 +8,7 @@
 - type: entity
  parent: BaseItem
  id: FoodBoxDonut
-  name: donutbox
+  name: donut box
  description: Mmm, Donuts.
  components:
  - type: Sprite
@@ -17,6 +17,9 @@
    state: box
  - type: Storage
    capacity: 6
+    whitelist:
+      tags:
+      - Donut
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donut.rsi
    size: 6
@@ -48,7 +51,7 @@
 - type: entity
  parent: BaseItem
  id: FoodContainerEgg
-  name: eggbox
+  name: egg carton
  description: Don't drop 'em!
  components:
  - type: Sprite
@@ -57,6 +60,9 @@
    state: box-closed
  - type: Storage
    capacity: 12
+    whitelist:
+      tags:
+      - Egg
  - type: Item
    sprite: Objects/Consumable/Food/egg.rsi
    size: 12
@@ -114,6 +120,7 @@
 - type: entity
  parent: FoodContainerEgg
  id: EggBoxBroken
+  suffix: Broken
  components:
  - type: StorageFill
    contents:
@@ -261,6 +268,9 @@
    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
    state: box
  - type: Storage
+    whitelist:
+      tags:
+      - DonkPocket
    capacity: 6
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -1,8 +1,5 @@
 # Base

- type: Tag
-  id: Egg
-
 - type: entity
  parent: BaseItem
  id: FoodEggBase
@@ -66,7 +63,7 @@
  - type: Puddle
    variants: 4
    state: egg
-    
+
 - type: entity
  name: eggshells
  parent: BaseItem
@@ -86,6 +83,9 @@
      reagents:
      - ReagentId: Egg
        Quantity: 1
+  - type: Tag
+    tags:
+    - Egg

 # Egg

--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -4,10 +4,15 @@
  id: PackPaperRolling
  description: "A pack of thin pieces of paper used to make fine smokeables."
  components:
-    # I know but it just works.
-  - type: FoodContainer
-    prototypes:
-      PaperRolling: 100
+  - type: Storage
+    whitelist:
+      tags:
+      - RollingPaper
+    capacity: 16
+  - type: StorageFill
+    contents:
+      - id: PaperRolling
+        amount: 8
  - type: Sprite
    sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
    state: cigpapers
@@ -29,6 +34,10 @@
      state: cigpaper
    - type: Item
      sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+      size: 2
+    - type: Tag
+      tags:
+      - RollingPaper

 - type: entity
  id: CigaretteFilter
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -42,6 +42,9 @@
    startUncuffSound: /Audio/Items/Handcuffs/rope_start.ogg
    endUncuffSound: /Audio/Items/Handcuffs/rope_breakout.ogg
    startBreakoutSound: /Audio/Items/Handcuffs/rope_takeoff.ogg
+  - type: Construction
+    graph: makeshifthandcuffs
+    node: cuffscable

  - type: Sprite
    sprite: Objects/Misc/cablecuffs.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -4,9 +4,15 @@
  id: MonkeyCubeBox
  description: Drymate brand monkey cubes. Just add water!
  components:
-  - type: FoodContainer
-    prototypes:
-      MonkeyCubeWrapper: 100
+  - type: Storage
+    whitelist:
+      tags:
+      - MonkeyCube
+    capacity: 30
+  - type: StorageFill
+    contents:
+      - id: MonkeyCubeWrapped
+        amount: 6
  - type: Sprite
    sprite: Objects/Misc/monkeycube.rsi
    state: box
@@ -14,13 +20,18 @@
 - type: entity
  parent: BaseItem
  name: monkey cube
-  id: MonkeyCubeWrapper
+  suffix: Wrapped
+  id: MonkeyCubeWrapped
  description: Unwrap this to get a monkey cube.
  components:
-  - type: FoodContainer
-    capacity: 1
-    prototypes:
-      MonkeyCube: 100
+  - type: SpawnItemsOnUse
+    items:
+      - id: MonkeyCube
+    sound:
+      path: /Audio/Effects/unwrap.ogg
  - type: Sprite
    sprite: Objects/Misc/monkeycube.rsi
    state: wrapper
+  - type: Tag
+    tags:
+    - MonkeyCube
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
@@ -50,7 +50,7 @@
  name: pest spray
  id: PestSpray
  parent: WeedSpray
-  description: Objects/Tools/Hydroponics/sprays.rsi
+  description: It's some pest eliminator spray! Do not inhale!
  suffix: "Filled"
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -12,6 +12,7 @@
    sprite: Objects/Tools/bucket.rsi
    state: icon
  - type: Clothing
+    size: 100
    sprite: Objects/Tools/bucket.rsi
    Slots:
    - Helmet
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -11,6 +11,7 @@
    - key: enum.SharedGasTankUiKey.Key
      type: GasTankBoundUserInterface
  - type: Clothing
+    size: 15
    sprite: Objects/Tanks/generic.rsi
    QuickEquip: false
  - type: GasTank
@@ -80,6 +81,7 @@
      volume: 2
      temperature: 293.15
  - type: Clothing
+    size: 10
    sprite: Objects/Tanks/emergency.rsi
    Slots:
    - Pocket
@@ -100,6 +102,7 @@
      volume: 6
      temperature: 293.15
  - type: Clothing
+    size: 10
    sprite: Objects/Tanks/emergency_yellow.rsi
    Slots:
    - Pocket
@@ -118,6 +121,7 @@
      volume: 10
      temperature: 293.15
  - type: Clothing
+    size: 10
    sprite: Objects/Tanks/emergency_double.rsi
    Slots:
    - Pocket
@@ -157,6 +161,7 @@
        volume: 70
        temperature: 293.15
    - type: Clothing
+      size: 10
      sprite: Objects/Tanks/plasma.rsi
      Slots:
        - Belt
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
@@ -4,7 +4,7 @@
  abstract: true
  components:
  - type: AccessReader
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    netsync: false
    sprite: Structures/Storage/closet.rsi
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -261,7 +261,7 @@
  components:
  - type: AccessReader
    access: [["Security"]]
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/sec_gear.rsi
    layers:
@@ -290,7 +290,7 @@
  components:
  - type: AccessReader
    access: [["Engineering"]]
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/engicrate_secure.rsi
    layers:
@@ -319,7 +319,7 @@
  components:
  - type: AccessReader
    access: [["Medical"]]
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/medicalcrate_secure.rsi
    layers:
@@ -347,7 +347,7 @@
  parent: CrateGeneric
  components:
  - type: AccessReader
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/privatecrate_secure.rsi
    layers:
@@ -376,7 +376,7 @@
  components:
  - type: AccessReader
    access: [["Research"]]
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/scicrate_secure.rsi
    layers:
@@ -405,7 +405,7 @@
  components:
  - type: AccessReader
    access: [["Engineering"]]
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/plasma.rsi
    layers:
@@ -433,7 +433,7 @@
  parent: CrateGeneric
  components:
  - type: AccessReader
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/secure.rsi
    layers:
@@ -462,7 +462,7 @@
  components:
  - type: AccessReader
    access: [["Service"]]
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/hydro_secure.rsi
    layers:
@@ -491,7 +491,7 @@
  components:
  - type: AccessReader
    access: [["Security"]]
-  - type: SecureEntityStorage
+  - type: Lock
  - type: Sprite
    sprite: Structures/Storage/Crates/weapon.rsi
    layers: